Index: include/python/ogr_python.i
===================================================================
--- include/python/ogr_python.i	(revision 12333)
+++ include/python/ogr_python.i	(working copy)
@@ -293,18 +293,18 @@
                 wkbGeometryCollection25D: 'GeometryCollection'  
       }
 
-      if self.GetGeometryType() == ogr.wkbGeometryCollection or \
-         self.GetGeometryType() == ogr.wkbGeometryCollection25D:
+      if self.GetGeometryType() == wkbGeometryCollection or \
+         self.GetGeometryType() == wkbGeometryCollection25D:
           geometries = []    
-          geom_count = geometry.GetGeometryCount()
+          geom_count = self.GetGeometryCount()
           for g in range(geom_count):
               geom = self.GetGeometryRef(g)
               geometries.append(geom.ExportToJson())
               output = {'type': types[self.GetGeometryType()],
                         'geometries': geometries}
       else:
-          output = {'type': types[geometry.GetGeometryType()],
-                    'coordinates': get_coordinates(geometry)}   
+          output = {'type': types[self.GetGeometryType()],
+                    'coordinates': get_coordinates(self)}   
 
       return output
       
Index: python/osgeo/ogr.py
===================================================================
--- python/osgeo/ogr.py	(revision 12333)
+++ python/osgeo/ogr.py	(working copy)
@@ -3086,18 +3086,18 @@
                   wkbGeometryCollection25D: 'GeometryCollection'  
         }
 
-        if self.GetGeometryType() == ogr.wkbGeometryCollection or \
-           self.GetGeometryType() == ogr.wkbGeometryCollection25D:
+        if self.GetGeometryType() == wkbGeometryCollection or \
+           self.GetGeometryType() == wkbGeometryCollection25D:
             geometries = []    
-            geom_count = geometry.GetGeometryCount()
+            geom_count = self.GetGeometryCount()
             for g in range(geom_count):
                 geom = self.GetGeometryRef(g)
                 geometries.append(geom.ExportToJson())
                 output = {'type': types[self.GetGeometryType()],
                           'geometries': geometries}
         else:
-            output = {'type': types[geometry.GetGeometryType()],
-                      'coordinates': get_coordinates(geometry)}   
+            output = {'type': types[self.GetGeometryType()],
+                      'coordinates': get_coordinates(self)}   
 
         return output