Merged revisions 7989,7991 via svnmerge from

mdboom · mdboom · commit 0c725cd5bd3e · 2009-12-01T15:17:21.000Z
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_99_maint ........ r7989 | mdboom | 2009-11-30 12:24:49 -0500 (Mon, 30 Nov 2009) | 1 line Fix SF-2903596 on the 0.99.x branch ........ r7991 | mdboom | 2009-11-30 13:30:09 -0500 (Mon, 30 Nov 2009) | 2 lines Fix bug in usage of "contains" ........ svn path=/trunk/matplotlib/; revision=7996
diff --git a/examples/event_handling/looking_glass.py b/examples/event_handling/looking_glass.py
@@ -24,7 +24,7 @@ def onpress(self, event):
       if event.inaxes!=ax:
          return
 
-      if not circ.contains(event):
+      if not circ.contains(event)[0]:
          return
 
       self.pressevent = event
diff --git a/setupext.py b/setupext.py
@@ -122,8 +122,8 @@
            'backend': None}
 
 defines = [
-	('PY_ARRAY_UNIQUE_SYMBOL', 'MPL_ARRAY_API'),
-	('PYCXX_ISO_CPP_LIB', '1')]
+        ('PY_ARRAY_UNIQUE_SYMBOL', 'MPL_ARRAY_API'),
+        ('PYCXX_ISO_CPP_LIB', '1')]
 
 # Based on the contents of setup.cfg, determine the build options
 if os.path.exists("setup.cfg"):
@@ -1123,7 +1123,7 @@ def build_ttconv(ext_modules, packages):
             'ttconv/ttutil.cpp']
 
     module = Extension('matplotlib.ttconv', deps,
-		       define_macros=defines)
+                       define_macros=defines)
     add_base_flags(module)
     ext_modules.append(module)
     BUILT_TTCONV = True
