matplotlib-checkins

SF.net SVN: matplotlib:[6563] trunk/matplotlib/lib/matplotlib/__init__.py

[<as...@us...>]

Revision: 6563
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6563&view=rev
Author:   astraw
Date:     2008-12-11 18:29:30 +0000 (Thu, 11 Dec 2008)

Log Message:
-----------
/matplotlib/__init__.py: catch OSError when calling subprocess.

An OSError can occur when the user does not have the command in the
path. Fixes an error reported by Nils Wagner.

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/__init__.py

Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/__init__.py	2008-12-11 17:45:45 UTC (rev 6562)
+++ trunk/matplotlib/lib/matplotlib/__init__.py	2008-12-11 18:29:30 UTC (rev 6563)
@@ -262,7 +262,7 @@
         line = s.stdout.readlines()[1]
         v = line.split()[-1]
         return v
-    except (IndexError, ValueError):
+    except (IndexError, ValueError, OSError):
         return None
 
 def checkdep_ghostscript():
@@ -275,7 +275,7 @@
                              stderr=subprocess.PIPE)
         v = s.stdout.read()[:-1]
         return v
-    except (IndexError, ValueError):
+    except (IndexError, ValueError, OSError):
         return None
 
 def checkdep_tex():
@@ -287,7 +287,7 @@
         match = re.search(pattern, line)
         v = match.group(0)
         return v
-    except (IndexError, ValueError, AttributeError):
+    except (IndexError, ValueError, AttributeError, OSError):
         return None
 
 def checkdep_pdftops():
@@ -298,7 +298,7 @@
             if 'version' in line:
                 v = line.split()[-1]
         return v
-    except (IndexError, ValueError, UnboundLocalError):
+    except (IndexError, ValueError, UnboundLocalError, OSError):
         return None
 
 def compare_versions(a, b):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6623] trunk/matplotlib/lib/matplotlib/__init__.py

[<jd...@us...>]

Revision: 6623
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6623&view=rev
Author:   jdh2358
Date:     2008-12-15 20:46:00 +0000 (Mon, 15 Dec 2008)

Log Message:
-----------
bumped version number

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/__init__.py

Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/__init__.py	2008-12-15 20:45:20 UTC (rev 6622)
+++ trunk/matplotlib/lib/matplotlib/__init__.py	2008-12-15 20:46:00 UTC (rev 6623)
@@ -89,7 +89,7 @@
 """
 from __future__ import generators
 
-__version__  = '0.98.5'
+__version__  = '0.98.6svn'
 __revision__ = '$Revision$'
 __date__     = '$Date$'
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6762] trunk/matplotlib/lib/matplotlib/__init__.py

[<ef...@us...>]

Revision: 6762
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6762&view=rev
Author:   efiring
Date:     2009-01-07 22:42:01 +0000 (Wed, 07 Jan 2009)

Log Message:
-----------
Merged 6754, 6761 from v0_98_5_maint

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/__init__.py

Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/__init__.py	2009-01-07 22:30:41 UTC (rev 6761)
+++ trunk/matplotlib/lib/matplotlib/__init__.py	2009-01-07 22:42:01 UTC (rev 6762)
@@ -679,7 +679,7 @@
 "%s"\n\t%s' % (val, cnt, line, fname, msg))
         elif key in _deprecated_ignore_map:
             warnings.warn('%s is deprecated. Update your matplotlibrc to use %s instead.'% (key, _deprecated_ignore_map[key]))
-            
+
         else:
             print >> sys.stderr, """
 Bad key "%s" on line %d in
@@ -838,9 +838,12 @@
     else:
         be_parts = arg.split('.')
         name = validate_backend(be_parts[0])
+        if len(be_parts) > 1:
+            if name == 'cairo':
+                rcParams['cairo.format'] = validate_cairo_format(be_parts[1])
+            else:
+                raise ValueError('Only cairo backend has a format option')
     rcParams['backend'] = name
-    if name == 'cairo' and len(be_parts) > 1:
-        rcParams['cairo.format'] = validate_cairo_format(be_parts[1])
 
 def get_backend():
     "Returns the current backend"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[7714] trunk/matplotlib/lib/matplotlib/__init__.py

[<jd...@us...>]

Revision: 7714
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7714&view=rev
Author:   jdh2358
Date:     2009-09-08 15:49:37 +0000 (Tue, 08 Sep 2009)

Log Message:
-----------
store old rc params before tests and then update after

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/__init__.py

Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/__init__.py	2009-09-08 15:23:02 UTC (rev 7713)
+++ trunk/matplotlib/lib/matplotlib/__init__.py	2009-09-08 15:49:37 UTC (rev 7714)
@@ -893,7 +893,15 @@
     import nose.plugins.builtin
     from testing.noseclasses import KnownFailure
     from nose.plugins.manager import PluginManager
+
+    backend = rcParams['backend']
+
     use('Agg') # use Agg backend for these tests
+
+    # store the old values before overriding
+    overrides = 'font.family', 'text.hinting'
+    stored = dict([(k, rcParams[k]) for k in overrides])
+
     rcParams['font.family'] = 'Bitstream Vera Sans'
     rcParams['text.hinting'] = False
     plugins = []
@@ -906,6 +914,11 @@
     success = nose.run( defaultTest=default_test_modules,
                         config=config,
                         )
+    # restore the old rc values
+    rcParams.update(stored)
+
+    # restore the old backend
+    use(backend)
     return success
 
 test.__test__ = False # nose: this function is not a test


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[8431] trunk/matplotlib/lib/matplotlib/__init__.py

[<ef...@us...>]

Revision: 8431
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8431&view=rev
Author:   efiring
Date:     2010-06-14 01:49:12 +0000 (Mon, 14 Jun 2010)

Log Message:
-----------
numpy version check: make it more readable

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/__init__.py

Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/__init__.py	2010-06-14 01:17:23 UTC (rev 8430)
+++ trunk/matplotlib/lib/matplotlib/__init__.py	2010-06-14 01:49:12 UTC (rev 8431)
@@ -145,12 +145,10 @@
     raise ImportError('matplotlib requires Python 2.4 or later')
 
 import numpy
-nn = numpy.__version__.split('.')
-if not (int(nn[0]) >= 1 and int(nn[1]) >= 1):
-    if not (int(nn[0]) >= 2):
-        raise ImportError(
-                'numpy 1.1 or later is required; you have %s' %
-                numpy.__version__)
+nmajor, nminor = [int(n) for n in numpy.__version__.split('.')[:2]]
+if not (nmajor > 1 or (nmajor == 1 and nminor >= 1)):
+    raise ImportError(
+            'numpy 1.1 or later is required; you have %s' % numpy.__version__)
 
 def is_string_like(obj):
     if hasattr(obj, 'shape'): return 0


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[8476] trunk/matplotlib/lib/matplotlib/__init__.py

[<jd...@us...>]

Revision: 8476
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8476&view=rev
Author:   jdh2358
Date:     2010-06-29 13:30:09 +0000 (Tue, 29 Jun 2010)

Log Message:
-----------
bump version number for rc

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/__init__.py

Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/__init__.py	2010-06-28 14:05:17 UTC (rev 8475)
+++ trunk/matplotlib/lib/matplotlib/__init__.py	2010-06-29 13:30:09 UTC (rev 8476)
@@ -99,7 +99,7 @@
 """
 from __future__ import generators
 
-__version__  = '1.0.svn'
+__version__  = '1.0rc1'
 __revision__ = '$Revision$'
 __date__     = '$Date$'
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[8657] trunk/matplotlib/lib/matplotlib/__init__.py

[<fer...@us...>]

Revision: 8657
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8657&view=rev
Author:   fer_perez
Date:     2010-08-25 22:13:56 +0000 (Wed, 25 Aug 2010)

Log Message:
-----------
Fix small bug where module names were being incorrectly lowercased in
backend specifications.

Thanks to Evan Patterson and Brian Granger for spotting the problem
and fix.

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/__init__.py

Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/__init__.py	2010-08-25 07:15:15 UTC (rev 8656)
+++ trunk/matplotlib/lib/matplotlib/__init__.py	2010-08-25 22:13:56 UTC (rev 8657)
@@ -880,10 +880,11 @@
     if 'matplotlib.backends' in sys.modules:
         if warn: warnings.warn(_use_error_msg)
         return
-    arg = arg.lower()
     if arg.startswith('module://'):
         name = arg
     else:
+        # Lowercase only non-module backend names (modules are case-sensitive)
+        arg = arg.lower()
         be_parts = arg.split('.')
         name = validate_backend(be_parts[0])
         if len(be_parts) > 1:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.