SC

Steve Chaplin · Steve Chaplin · commit dfbc9dfb295e · 2005-06-20T08:36:09.000Z
svn path=/trunk/matplotlib/; revision=1491
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,8 @@
 New entries should be added at the top
   
+2005-06-20 setupext.py: fix problem where _nc_backend_gdk is installed to the
+           wrong directory - SC
+
 2005-06-19 Added 10.4 support for CocoaAgg. - CM
 
 2005-06-18 Move Figure.get_width_height() to FigureCanvasBase and return
diff --git a/lib/matplotlib/backends/backend_gdk.py b/lib/matplotlib/backends/backend_gdk.py
@@ -40,9 +40,9 @@ def fn_name(): return sys._getframe(1).f_code.co_name
 # do after gtk else get "pygtk.require() must be called before importing gtk"
 # errors
 if numerix.which[0] == "numarray":
-    from matplotlib._na_backend_gdk import pixbuf_get_pixels_array
+    from matplotlib.backends._na_backend_gdk import pixbuf_get_pixels_array
 else:
-    from matplotlib._nc_backend_gdk import pixbuf_get_pixels_array
+    from matplotlib.backends._nc_backend_gdk import pixbuf_get_pixels_array
 
 
 DEBUG = False
diff --git a/setupext.py b/setupext.py
@@ -592,10 +592,9 @@ def build_gdk(ext_modules, packages, numerix):
     if numerix in ["numarray","both"]: # Build for numarray
         temp_copy('src/_backend_gdk.c', 'src/_na_backend_gdk.c')
         module = Extension(
-            'matplotlib._na_backend_gdk',
-		[ 'src/_na_backend_gdk.c',
-		],
-		libraries = [],
+            'matplotlib.backends._na_backend_gdk',
+            ['src/_na_backend_gdk.c', ],
+            libraries = [],
             )
         module.extra_compile_args.append('-DNUMARRAY=1')
         add_base_flags(module)
@@ -605,10 +604,9 @@ def build_gdk(ext_modules, packages, numerix):
     if numerix in ["Numeric","both"]: # Build for Numeric
         temp_copy('src/_backend_gdk.c', 'src/_nc_backend_gdk.c')
         module = Extension(
-            'matplotlib._nc_backend_gdk',
-		[ 'src/_nc_backend_gdk.c',
-		],
-		libraries = [],
+            'matplotlib.backends._nc_backend_gdk',
+            ['src/_nc_backend_gdk.c', ],
+            libraries = [],
             )
         module.extra_compile_args.append('-DNUMERIC=1')
         add_base_flags(module)
diff --git a/src/_backend_gdk.c b/src/_backend_gdk.c
@@ -15,10 +15,13 @@
 static PyTypeObject *_PyGdkPixbuf_Type;
 #define PyGdkPixbuf_Type (*_PyGdkPixbuf_Type)
 
-/* Implement an equivalent to the pygtk method pixbuf.get_pixels_array()
- * Fedora 1,2,3 (for example) has PyGTK but does not have Numeric
- * and so does not have pixbuf.get_pixels_array().
- * Also provide numarray as well as Numeric support
+/* Implement the equivalent to gtk.gdk.Pixbuf.get_pixels_array()
+ * To solve these problems with the pygtk version:
+ * 1) It works for Numeric, but not numarray
+ * 2) Its only available if pygtk is compiled with Numeric support
+ * Fedora 1,2,3 has PyGTK, but not Numeric and so does not have 
+ * Pixbuf.get_pixels_array().
+ * Fedora 4 does have PyGTK, Numeric and Pixbuf.get_pixels_array()
  */
 
 static PyObject *
@@ -67,12 +70,14 @@ DL_EXPORT(void)
 init_na_backend_gdk(void)
 {
     PyObject *mod;
-    mod = Py_InitModule("matplotlib._na_backend_gdk", _backend_gdk_functions);
+    mod = Py_InitModule("matplotlib.backends._na_backend_gdk", 
+			_backend_gdk_functions);
 #else
 init_nc_backend_gdk(void)
 {
     PyObject *mod;
-    mod = Py_InitModule("matplotlib._nc_backend_gdk", _backend_gdk_functions);
+    mod = Py_InitModule("matplotlib.backends._nc_backend_gdk", 
+			_backend_gdk_functions);
 #endif
 
     import_array();
