date:20090304

SF.net SVN: matplotlib:[6952] branches/v0_98_5_maint/lib/matplotlib/ sphinxext/plot_directive.py

2009-03-04 Thread mdboom

Revision: 6952
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6952&view=rev
Author:   mdboom
Date: 2009-03-04 13:25:41 + (Wed, 04 Mar 2009)

Log Message:
---
Fix for Python 2.4 compatibility.

Modified Paths:
--
branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py

Modified: branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py
===
--- branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py   
2009-03-03 22:08:38 UTC (rev 6951)
+++ branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py   
2009-03-04 13:25:41 UTC (rev 6952)
@@ -136,8 +136,6 @@
 try:
 fd = open(fname)
 module = imp.load_module("__main__", fd, fname, ('py', 'r', 
imp.PY_SOURCE))
-except:
-raise
 finally:
 del sys.path[0]
 os.chdir(pwd)


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

--
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[6953] trunk/matplotlib

2009-03-04 Thread mdboom

Revision: 6953
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6953&view=rev
Author:   mdboom
Date: 2009-03-04 13:27:00 + (Wed, 04 Mar 2009)

Log Message:
---
Merged revisions 6952 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint


  r6952 | mdboom | 2009-03-04 08:25:41 -0500 (Wed, 04 Mar 2009) | 2 lines
  
  Fix for Python 2.4 compatibility.


Modified Paths:
--
trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py

Property Changed:

trunk/matplotlib/
trunk/matplotlib/doc/pyplots/README
trunk/matplotlib/doc/sphinxext/gen_gallery.py
trunk/matplotlib/doc/sphinxext/gen_rst.py
trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py


Property changes on: trunk/matplotlib
___
Modified: svnmerge-integrated
   - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6950
   + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6952
Modified: svn:mergeinfo
   - /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950
   + /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952


Property changes on: trunk/matplotlib/doc/pyplots/README
___
Modified: svn:mergeinfo
   - 
/branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950
   + 
/branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952


Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950
   + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952


Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py
___
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950
   + /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952


Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
___
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950
   + /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952


Property changes on: 
trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
___
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/sphinxext/only_directives.py:57

SF.net SVN: matplotlib:[6954] trunk/matplotlib/lib/matplotlib/mathtext.py

2009-03-04 Thread mdboom

Revision: 6954
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6954&view=rev
Author:   mdboom
Date: 2009-03-04 18:16:50 + (Wed, 04 Mar 2009)

Log Message:
---
Fix a few bugs when mathtext.default is 'regular'

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

Modified: trunk/matplotlib/lib/matplotlib/mathtext.py
===
--- trunk/matplotlib/lib/matplotlib/mathtext.py 2009-03-04 13:27:00 UTC (rev 
6953)
+++ trunk/matplotlib/lib/matplotlib/mathtext.py 2009-03-04 18:16:50 UTC (rev 
6954)
@@ -843,7 +843,7 @@
 return self.cm_fallback._get_glyph(
 fontname, 'it', sym, fontsize)
 else:
-if fontname == 'it' and isinstance(self, StixFonts):
+if fontname in ('it', 'regular') and isinstance(self, 
StixFonts):
 return self._get_glyph('rm', font_class, sym, fontsize)
 warn("Font '%s' does not have a glyph for '%s'" %
  (fontname, sym.encode('ascii', 'backslashreplace')),
@@ -916,7 +916,7 @@
 
 if mapping is not None:
 if isinstance(mapping, dict):
-mapping = mapping[font_class]
+mapping = mapping.get(font_class, 'rm')
 
 # Binary search for the source glyph
 lo = 0


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

--
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[6955] trunk/matplotlib/src/ft2font.cpp

2009-03-04 Thread mdboom

Revision: 6955
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6955&view=rev
Author:   mdboom
Date: 2009-03-04 20:53:29 + (Wed, 04 Mar 2009)

Log Message:
---
Fix wiggly baseline problem (again -- should have truncated rather than rounded)

Modified Paths:
--
trunk/matplotlib/src/ft2font.cpp

Modified: trunk/matplotlib/src/ft2font.cpp
===
--- trunk/matplotlib/src/ft2font.cpp2009-03-04 18:16:50 UTC (rev 6954)
+++ trunk/matplotlib/src/ft2font.cpp2009-03-04 20:53:29 UTC (rev 6955)
@@ -1257,8 +1257,8 @@
 
   double xd = Py::Float(args[1]);
   double yd = Py::Float(args[2]);
-  long x = (long)mpl_round(xd);
-  long y = (long)mpl_round(yd);
+  long x = (long)xd;
+  long y = (long)yd;
   FT_Vector sub_offset;
   sub_offset.x = int((xd - (double)x) * 64.0);
   sub_offset.y = int((yd - (double)y) * 64.0);


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

--
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[6956] trunk/matplotlib

2009-03-04 Thread leejjoon

Revision: 6956
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6956&view=rev
Author:   leejjoon
Date: 2009-03-05 04:45:00 + (Thu, 05 Mar 2009)

Log Message:
---
hashing of FontProperties accounts current rcParams

Modified Paths:
--
trunk/matplotlib/CHANGELOG
trunk/matplotlib/lib/matplotlib/font_manager.py

Modified: trunk/matplotlib/CHANGELOG
===
--- trunk/matplotlib/CHANGELOG  2009-03-04 20:53:29 UTC (rev 6955)
+++ trunk/matplotlib/CHANGELOG  2009-03-05 04:45:00 UTC (rev 6956)
@@ -1,3 +1,5 @@
+2009-02-28 hashing of FontProperties accounts current rcParams - JJL
+
 2009-02-28 Prevent double-rendering of shared axis in twinx, twiny - EF
 
 2009-02-26 Add optional bbox_to_anchor argument for legend class - JJL

Modified: trunk/matplotlib/lib/matplotlib/font_manager.py
===
--- trunk/matplotlib/lib/matplotlib/font_manager.py 2009-03-04 20:53:29 UTC 
(rev 6955)
+++ trunk/matplotlib/lib/matplotlib/font_manager.py 2009-03-05 04:45:00 UTC 
(rev 6956)
@@ -705,10 +705,9 @@
 return parse_fontconfig_pattern(pattern)
 
 def __hash__(self):
-l = self.__dict__.items()
-l.sort()
+l = [(k, getattr(self, "get" + k)()) for k in sorted(self.__dict__)]
 return hash(repr(l))
-
+ 
 def __str__(self):
 return self.get_fontconfig_pattern()
 
@@ -1181,7 +1180,7 @@
 """
 debug = False
 if prop is None:
-return self.defaultFont
+prop = FontProperties()
 if is_string_like(prop):
 prop = FontProperties(prop)
 fname = prop.get_file()


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

--
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[6952] branches/v0_98_5_maint/lib/matplotlib/ sphinxext/plot_directive.py

SF.net SVN: matplotlib:[6953] trunk/matplotlib

SF.net SVN: matplotlib:[6954] trunk/matplotlib/lib/matplotlib/mathtext.py

SF.net SVN: matplotlib:[6955] trunk/matplotlib/src/ft2font.cpp

SF.net SVN: matplotlib:[6956] trunk/matplotlib

5 matches

Site Navigation

Mail list logo

Footer information