Permalink
Browse files

Merge remote-tracking branch 'upstream/v1.2.x'

  • Loading branch information...
2 parents ee2d7f7 + 02c1d41 commit e2a29a4e312adaf1418608c10dc4275c90585d44 @mdboom mdboom committed Oct 15, 2012
Showing with 13 additions and 9 deletions.
  1. +12 −4 lib/matplotlib/__init__.py
  2. +1 −1 lib/matplotlib/axes.py
  3. +0 −4 lib/matplotlib/rcsetup.py
@@ -214,8 +214,14 @@ class Verbose:
_commandLineVerbose = None
for arg in sys.argv[1:]:
- if not arg.startswith('--verbose-'): continue
- _commandLineVerbose = arg[10:]
+ if not arg.startswith('--verbose-'):
+ continue
+ level_str = arg[10:]
+ # If it doesn't match one of ours, then don't even
+ # bother noting it, we are just a 3rd-party library
+ # to somebody else's script.
+ if level_str in levels:
+ _commandLineVerbose = level_str
def __init__(self):
self.set_level('silent')
@@ -227,8 +233,10 @@ def set_level(self, level):
if self._commandLineVerbose is not None:
level = self._commandLineVerbose
if level not in self.levels:
- raise ValueError('Illegal verbose string "%s". Legal values are %s'%(level, self.levels))
- self.level = level
+ warnings.warn('matplotlib: unrecognized --verbose-* string "%s".'
+ ' Legal values are %s' % (level, self.levels))
+ else:
+ self.level = level
def set_fileo(self, fname):
std = {
@@ -8141,7 +8141,7 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
x[0::2], x[1::2] = bins, bins
- minimum = min(bins)
+ minimum = np.min(n)
if align == 'left' or align == 'center':
x -= 0.5*(bins[1]-bins[0])
@@ -114,10 +114,6 @@ def validate_backend(s):
'None','classic','toolbar2',
], ignorecase=True)
-def validate_autolayout(v):
- if v:
- warnings.warn("figure.autolayout is not currently supported")
-
def validate_maskedarray(v):
# 2008/12/12: start warning; later, remove all traces of maskedarray
try:

0 comments on commit e2a29a4

Please sign in to comment.