diff options
| -rw-r--r-- | numpy/_import_tools.py | 4 | ||||
| -rw-r--r-- | numpy/core/ma.py | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/numpy/_import_tools.py b/numpy/_import_tools.py index be4852c72..48dc6372d 100644 --- a/numpy/_import_tools.py +++ b/numpy/_import_tools.py @@ -155,7 +155,7 @@ class PackageLoader: Optional keyword inputs: - - verbose - integer specifying verbosity level [default: 0]. + - verbose - integer specifying verbosity level [default: -1]. verbose=-1 will suspend also warnings. - force - when True, force reloading loaded packages [default: False]. - postpone - when True, don't load packages [default: False] @@ -168,7 +168,7 @@ class PackageLoader: self.info_modules = {} if options.get('force',False): self.imported_packages = [] - self.verbose = verbose = options.get('verbose',False) + self.verbose = verbose = options.get('verbose',-1) postpone = options.get('postpone',None) self._init_info_modules(packages or None) diff --git a/numpy/core/ma.py b/numpy/core/ma.py index 35f8ee120..18a4e9a8a 100644 --- a/numpy/core/ma.py +++ b/numpy/core/ma.py @@ -1543,7 +1543,11 @@ def repeat(a, repeats, axis=None): """ af = filled(a) if isinstance(repeats, types.IntType): - repeats = tuple([repeats]*(shape(af)[axis])) + if axis is None: + num = af.size + else: + num = af.shape[axis] + repeats = tuple([repeats]*num) m = getmask(a) if m is not nomask: |