Thread: SF.net SVN: matplotlib: [4077] trunk/toolkits/basemap-testing/src

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4077
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4077&view=rev
Author:   jswhit
Date:     2007-10-31 20:22:40 -0700 (Wed, 31 Oct 2007)

Log Message:
-----------
reverse Eric's changes for now

Modified Paths:
--------------
    trunk/toolkits/basemap-testing/src/_geod.c
    trunk/toolkits/basemap-testing/src/_proj.c
    trunk/toolkits/basemap-testing/src/_proj.pyx

Modified: trunk/toolkits/basemap-testing/src/_geod.c
===================================================================

--- trunk/toolkits/basemap-testing/src/_geod.c	2007-11-01 03:18:09 UTC (rev 4076)
+++ trunk/toolkits/basemap-testing/src/_geod.c	2007-11-01 03:22:40 UTC (rev 4077)
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.9.6.7 on Sun Oct 14 08:16:22 2007 */
+/* Generated by Cython 0.9.6.7 on Wed Oct 31 21:20:49 2007 */
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
@@ -160,7 +160,7 @@
   __pyx_v_key = Py_None; Py_INCREF(Py_None);
   __pyx_v_value = Py_None; Py_INCREF(Py_None);
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":13
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":13
  *     def __new__(self, geodparams):
  *         cdef GEODESIC_T GEOD_T
  *         self.geodparams = geodparams             # <<<<<<<<<<<<<< 
@@ -171,7 +171,7 @@
   Py_DECREF(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodparams);
   ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodparams = __pyx_v_geodparams;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":15
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":15
  *         self.geodparams = geodparams
  *         # setup proj initialization string.
  *         geodargs = []             # <<<<<<<<<<<<<< 
@@ -183,7 +183,7 @@
   __pyx_v_geodargs = __pyx_1;
   __pyx_1 = 0;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":16
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":16
  *         # setup proj initialization string.
  *         geodargs = []
  *         for key,value in geodparams.iteritems():             # <<<<<<<<<<<<<< 
@@ -232,7 +232,7 @@
       Py_DECREF(__pyx_4); __pyx_4 = 0;
     }
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":17
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":17
  *         geodargs = []
  *         for key,value in geodparams.iteritems():
  *             geodargs.append('+'+key+"="+str(value)+' ')             # <<<<<<<<<<<<<< 
@@ -263,7 +263,7 @@
   }
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":18
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":18
  *         for key,value in geodparams.iteritems():
  *             geodargs.append('+'+key+"="+str(value)+' ')
  *         self.geodinitstring = PyString_AsString(''.join(geodargs))             # <<<<<<<<<<<<<< 
@@ -280,7 +280,7 @@
   ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodinitstring = PyString_AsString(__pyx_6);
   Py_DECREF(__pyx_6); __pyx_6 = 0;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":20
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":20
  *         self.geodinitstring = PyString_AsString(''.join(geodargs))
  *         # initialize projection
  *         self.geodesic_t = GEOD_init_plus(self.geodinitstring, &GEOD_T)[0]             # <<<<<<<<<<<<<< 
@@ -289,7 +289,7 @@
  */
   ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t = (GEOD_init_plus(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodinitstring,(&__pyx_v_GEOD_T))[0]);
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":21
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":21
  *         # initialize projection
  *         self.geodesic_t = GEOD_init_plus(self.geodinitstring, &GEOD_T)[0]
  *         if pj_errno != 0:             # <<<<<<<<<<<<<< 
@@ -299,7 +299,7 @@
   __pyx_7 = (pj_errno != 0);
   if (__pyx_7) {
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":22
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":22
  *         self.geodesic_t = GEOD_init_plus(self.geodinitstring, &GEOD_T)[0]
  *         if pj_errno != 0:
  *             raise RuntimeError(pj_strerrno(pj_errno))             # <<<<<<<<<<<<<< 
@@ -319,7 +319,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":23
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":23
  *         if pj_errno != 0:
  *             raise RuntimeError(pj_strerrno(pj_errno))
  *         self.proj_version = PJ_VERSION/100.             # <<<<<<<<<<<<<< 
@@ -361,7 +361,7 @@
   PyObject *__pyx_3 = 0;
   Py_INCREF(__pyx_v_self);
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":27
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":27
  *     def __reduce__(self):
  *         """special method that allows pyproj.Geod instance to be pickled"""
  *         return (self.__class__,(self.geodparams,))             # <<<<<<<<<<<<<< 
@@ -445,7 +445,7 @@
   Py_INCREF(__pyx_v_dist);
   Py_INCREF(__pyx_v_radians);
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":40
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":40
  *         cdef void *londata, *latdata, *azdat, *distdat
  *         # if buffer api is supported, get pointer to data buffers.
  *         if PyObject_AsWriteBuffer(lons, &londata, &buflenlons) <> 0:             # <<<<<<<<<<<<<< 
@@ -455,7 +455,7 @@
   __pyx_1 = (PyObject_AsWriteBuffer(__pyx_v_lons,(&__pyx_v_londata),(&__pyx_v_buflenlons)) != 0);
   if (__pyx_1) {
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":41
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":41
  *         # if buffer api is supported, get pointer to data buffers.
  *         if PyObject_AsWriteBuffer(lons, &londata, &buflenlons) <> 0:
  *             raise RuntimeError             # <<<<<<<<<<<<<< 
@@ -468,7 +468,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":42
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":42
  *         if PyObject_AsWriteBuffer(lons, &londata, &buflenlons) <> 0:
  *             raise RuntimeError
  *         if PyObject_AsWriteBuffer(lats, &latdata, &buflenlats) <> 0:             # <<<<<<<<<<<<<< 
@@ -478,7 +478,7 @@
   __pyx_1 = (PyObject_AsWriteBuffer(__pyx_v_lats,(&__pyx_v_latdata),(&__pyx_v_buflenlats)) != 0);
   if (__pyx_1) {
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":43
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":43
  *             raise RuntimeError
  *         if PyObject_AsWriteBuffer(lats, &latdata, &buflenlats) <> 0:
  *             raise RuntimeError             # <<<<<<<<<<<<<< 
@@ -491,7 +491,7 @@
   }
   __pyx_L3:;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":44
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":44
  *         if PyObject_AsWriteBuffer(lats, &latdata, &buflenlats) <> 0:
  *             raise RuntimeError
  *         if PyObject_AsWriteBuffer(az, &azdat, &buflenaz) <> 0:             # <<<<<<<<<<<<<< 
@@ -501,7 +501,7 @@
   __pyx_1 = (PyObject_AsWriteBuffer(__pyx_v_az,(&__pyx_v_azdat),(&__pyx_v_buflenaz)) != 0);
   if (__pyx_1) {
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":45
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":45
  *             raise RuntimeError
  *         if PyObject_AsWriteBuffer(az, &azdat, &buflenaz) <> 0:
  *             raise RuntimeError             # <<<<<<<<<<<<<< 
@@ -514,7 +514,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":46
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":46
  *         if PyObject_AsWriteBuffer(az, &azdat, &buflenaz) <> 0:
  *             raise RuntimeError
  *         if PyObject_AsWriteBuffer(dist, &distdat, &buflend) <> 0:             # <<<<<<<<<<<<<< 
@@ -524,7 +524,7 @@
   __pyx_1 = (PyObject_AsWriteBuffer(__pyx_v_dist,(&__pyx_v_distdat),(&__pyx_v_buflend)) != 0);
   if (__pyx_1) {
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":47
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":47
  *             raise RuntimeError
  *         if PyObject_AsWriteBuffer(dist, &distdat, &buflend) <> 0:
  *             raise RuntimeError             # <<<<<<<<<<<<<< 
@@ -537,7 +537,7 @@
   }
   __pyx_L5:;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":49
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":49
  *             raise RuntimeError
  *         # process data in buffer
  *         if not buflenlons == buflenlats == buflenaz == buflend:             # <<<<<<<<<<<<<< 
@@ -554,7 +554,7 @@
   __pyx_2 = (!__pyx_1);
   if (__pyx_2) {
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":50
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":50
  *         # process data in buffer
  *         if not buflenlons == buflenlats == buflenaz == buflend:
  *             raise RuntimeError("Buffer lengths not the same")             # <<<<<<<<<<<<<< 
@@ -573,7 +573,7 @@
   }
   __pyx_L6:;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":51
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":51
  *         if not buflenlons == buflenlats == buflenaz == buflend:
  *             raise RuntimeError("Buffer lengths not the same")
  *         ndim = buflenlons/_doublesize             # <<<<<<<<<<<<<< 
@@ -589,7 +589,7 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   __pyx_v_ndim = __pyx_6;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":52
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":52
  *             raise RuntimeError("Buffer lengths not the same")
  *         ndim = buflenlons/_doublesize
  *         lonsdata = <double *>londata             # <<<<<<<<<<<<<< 
@@ -598,7 +598,7 @@
  */
   __pyx_v_lonsdata = ((double (*))__pyx_v_londata);
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":53
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":53
  *         ndim = buflenlons/_doublesize
  *         lonsdata = <double *>londata
  *         latsdata = <double *>latdata             # <<<<<<<<<<<<<< 
@@ -607,7 +607,7 @@
  */
   __pyx_v_latsdata = ((double (*))__pyx_v_latdata);
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":54
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":54
  *         lonsdata = <double *>londata
  *         latsdata = <double *>latdata
  *         azdata = <double *>azdat             # <<<<<<<<<<<<<< 
@@ -616,7 +616,7 @@
  */
   __pyx_v_azdata = ((double (*))__pyx_v_azdat);
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":55
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":55
  *         latsdata = <double *>latdata
  *         azdata = <double *>azdat
  *         distdata = <double *>distdat             # <<<<<<<<<<<<<< 
@@ -625,7 +625,7 @@
  */
   __pyx_v_distdata = ((double (*))__pyx_v_distdat);
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":56
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":56
  *         azdata = <double *>azdat
  *         distdata = <double *>distdat
  *         for i from 0 <= i < ndim:             # <<<<<<<<<<<<<< 
@@ -634,7 +634,7 @@
  */
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_ndim; __pyx_v_i++) {
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":57
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":57
  *         distdata = <double *>distdat
  *         for i from 0 <= i < ndim:
  *             if radians:             # <<<<<<<<<<<<<< 
@@ -644,7 +644,7 @@
     __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_v_radians); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; goto __pyx_L1;}
     if (__pyx_1) {
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":58
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":58
  *         for i from 0 <= i < ndim:
  *             if radians:
  *                 self.geodesic_t.p1.v = lonsdata[i]             # <<<<<<<<<<<<<< 
@@ -653,7 +653,7 @@
  */
       ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.v = (__pyx_v_lonsdata[__pyx_v_i]);
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":59
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":59
  *             if radians:
  *                 self.geodesic_t.p1.v = lonsdata[i]
  *                 self.geodesic_t.p1.u = latsdata[i]             # <<<<<<<<<<<<<< 
@@ -662,7 +662,7 @@
  */
       ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.u = (__pyx_v_latsdata[__pyx_v_i]);
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":60
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":60
  *                 self.geodesic_t.p1.v = lonsdata[i]
  *                 self.geodesic_t.p1.u = latsdata[i]
  *                 self.geodesic_t.ALPHA12 = azdata[i]             # <<<<<<<<<<<<<< 
@@ -671,7 +671,7 @@
  */
       ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.ALPHA12 = (__pyx_v_azdata[__pyx_v_i]);
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":61
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":61
  *                 self.geodesic_t.p1.u = latsdata[i]
  *                 self.geodesic_t.ALPHA12 = azdata[i]
  *                 self.geodesic_t.DIST = distdata[i]             # <<<<<<<<<<<<<< 
@@ -683,7 +683,7 @@
     }
     /*else*/ {
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":63
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":63
  *                 self.geodesic_t.DIST = distdata[i]
  *             else:
  *                 self.geodesic_t.p1.v = _dg2rad*lonsdata[i]             # <<<<<<<<<<<<<< 
@@ -699,7 +699,7 @@
       Py_DECREF(__pyx_5); __pyx_5 = 0;
       ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.v = __pyx_7;
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":64
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":64
  *             else:
  *                 self.geodesic_t.p1.v = _dg2rad*lonsdata[i]
  *                 self.geodesic_t.p1.u = _dg2rad*latsdata[i]             # <<<<<<<<<<<<<< 
@@ -715,7 +715,7 @@
       Py_DECREF(__pyx_5); __pyx_5 = 0;
       ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.u = __pyx_7;
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":65
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":65
  *                 self.geodesic_t.p1.v = _dg2rad*lonsdata[i]
  *                 self.geodesic_t.p1.u = _dg2rad*latsdata[i]
  *                 self.geodesic_t.ALPHA12 = _dg2rad*azdata[i]             # <<<<<<<<<<<<<< 
@@ -731,7 +731,7 @@
       Py_DECREF(__pyx_5); __pyx_5 = 0;
       ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.ALPHA12 = __pyx_7;
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":66
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":66
  *                 self.geodesic_t.p1.u = _dg2rad*latsdata[i]
  *                 self.geodesic_t.ALPHA12 = _dg2rad*azdata[i]
  *                 self.geodesic_t.DIST = distdata[i]             # <<<<<<<<<<<<<< 
@@ -742,7 +742,7 @@
     }
     __pyx_L9:;
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":67
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":67
  *                 self.geodesic_t.ALPHA12 = _dg2rad*azdata[i]
  *                 self.geodesic_t.DIST = distdata[i]
  *             geod_pre(&self.geodesic_t)             # <<<<<<<<<<<<<< 
@@ -751,7 +751,7 @@
  */
     geod_pre((&((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t));
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":68
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":68
  *                 self.geodesic_t.DIST = distdata[i]
  *             geod_pre(&self.geodesic_t)
  *             if pj_errno != 0:             # <<<<<<<<<<<<<< 
@@ -761,7 +761,7 @@
     __pyx_2 = (pj_errno != 0);
     if (__pyx_2) {
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":69
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":69
  *             geod_pre(&self.geodesic_t)
  *             if pj_errno != 0:
  *                 raise RuntimeError(pj_strerrno(pj_errno))             # <<<<<<<<<<<<<< 
@@ -781,7 +781,7 @@
     }
     __pyx_L10:;
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":70
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":70
  *             if pj_errno != 0:
  *                 raise RuntimeError(pj_strerrno(pj_errno))
  *             geod_for(&self.geodesic_t)             # <<<<<<<<<<<<<< 
@@ -790,7 +790,7 @@
  */
     geod_for((&((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t));
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":71
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":71
  *                 raise RuntimeError(pj_strerrno(pj_errno))
  *             geod_for(&self.geodesic_t)
  *             if pj_errno != 0:             # <<<<<<<<<<<<<< 
@@ -800,7 +800,7 @@
     __pyx_1 = (pj_errno != 0);
     if (__pyx_1) {
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":72
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":72
  *             geod_for(&self.geodesic_t)
  *             if pj_errno != 0:
  *                 raise RuntimeError(pj_strerrno(pj_errno))             # <<<<<<<<<<<<<< 
@@ -820,7 +820,7 @@
     }
     __pyx_L11:;
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":73
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":73
  *             if pj_errno != 0:
  *                 raise RuntimeError(pj_strerrno(pj_errno))
  *             if isnan(self.geodesic_t.ALPHA21):             # <<<<<<<<<<<<<< 
@@ -830,7 +830,7 @@
     __pyx_8 = isnan(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.ALPHA21);
     if (__pyx_8) {
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":74
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":74
  *                 raise RuntimeError(pj_strerrno(pj_errno))
  *             if isnan(self.geodesic_t.ALPHA21):
  *                 raise ValueError('undefined forward geodesic (may be an equatorial arc)')             # <<<<<<<<<<<<<< 
@@ -849,7 +849,7 @@
     }
     __pyx_L12:;
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":75
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":75
  *             if isnan(self.geodesic_t.ALPHA21):
  *                 raise ValueError('undefined forward geodesic (may be an equatorial arc)')
  *             if radians:             # <<<<<<<<<<<<<< 
@@ -859,7 +859,7 @@
     __pyx_2 = __Pyx_PyObject_IsTrue(__pyx_v_radians); if (unlikely(__pyx_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 75; goto __pyx_L1;}
     if (__pyx_2) {
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":76
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":76
  *                 raise ValueError('undefined forward geodesic (may be an equatorial arc)')
  *             if radians:
  *                 lonsdata[i] = self.geodesic_t.p2.v             # <<<<<<<<<<<<<< 
@@ -868,7 +868,7 @@
  */
       (__pyx_v_lonsdata[__pyx_v_i]) = ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p2.v;
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":77
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":77
  *             if radians:
  *                 lonsdata[i] = self.geodesic_t.p2.v
  *                 latsdata[i] = self.geodesic_t.p2.u             # <<<<<<<<<<<<<< 
@@ -877,7 +877,7 @@
  */
       (__pyx_v_latsdata[__pyx_v_i]) = ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p2.u;
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":78
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":78
  *                 lonsdata[i] = self.geodesic_t.p2.v
  *                 latsdata[i] = self.geodesic_t.p2.u
  *                 azdata[i] = self.geodesic_t.ALPHA21             # <<<<<<<<<<<<<< 
@@ -889,7 +889,7 @@
     }
     /*else*/ {
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":80
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":80
  *                 azdata[i] = self.geodesic_t.ALPHA21
  *             else:
  *                 lonsdata[i] = _rad2dg*self.geodesic_t.p2.v             # <<<<<<<<<<<<<< 
@@ -905,7 +905,7 @@
       Py_DECREF(__pyx_4); __pyx_4 = 0;
       (__pyx_v_lonsdata[__pyx_v_i]) = __pyx_7;
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":81
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":81
  *             else:
  *                 lonsdata[i] = _rad2dg*self.geodesic_t.p2.v
  *                 latsdata[i] = _rad2dg*self.geodesic_t.p2.u             # <<<<<<<<<<<<<< 
@@ -921,7 +921,7 @@
       Py_DECREF(__pyx_4); __pyx_4 = 0;
       (__pyx_v_latsdata[__pyx_v_i]) = __pyx_7;
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":82
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":82
  *                 lonsdata[i] = _rad2dg*self.geodesic_t.p2.v
  *                 latsdata[i] = _rad2dg*self.geodesic_t.p2.u
  *                 azdata[i] = _rad2dg*self.geodesic_t.ALPHA21             # <<<<<<<<<<<<<< 
@@ -1005,7 +1005,7 @@
   Py_INCREF(__pyx_v_lats2);
   Py_INCREF(__pyx_v_radians);
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":94
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":94
  *         cdef void *londata, *latdata, *azdat, *distdat
  *         # if buffer api is supported, get pointer to data buffers.
  *         if PyObject_AsWriteBuffer(lons1, &londata, &buflenlons) <> 0:             # <<<<<<<<<<<<<< 
@@ -1015,7 +1015,7 @@
   __pyx_1 = (PyObject_AsWriteBuffer(__pyx_v_lons1,(&__pyx_v_londata),(&__pyx_v_buflenlons)) != 0);
   if (__pyx_1) {
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":95
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":95
  *         # if buffer api is supported, get pointer to data buffers.
  *         if PyObject_AsWriteBuffer(lons1, &londata, &buflenlons) <> 0:
  *             raise RuntimeError             # <<<<<<<<<<<<<< 
@@ -1028,7 +1028,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":96
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":96
  *         if PyObject_AsWriteBuffer(lons1, &londata, &buflenlons) <> 0:
  *             raise RuntimeError
  *         if PyObject_AsWriteBuffer(lats1, &latdata, &buflenlats) <> 0:             # <<<<<<<<<<<<<< 
@@ -1038,7 +1038,7 @@
   __pyx_1 = (PyObject_AsWriteBuffer(__pyx_v_lats1,(&__pyx_v_latdata),(&__pyx_v_buflenlats)) != 0);
   if (__pyx_1) {
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":97
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":97
  *             raise RuntimeError
  *         if PyObject_AsWriteBuffer(lats1, &latdata, &buflenlats) <> 0:
  *             raise RuntimeError             # <<<<<<<<<<<<<< 
@@ -1051,7 +1051,7 @@
   }
   __pyx_L3:;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":98
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":98
  *         if PyObject_AsWriteBuffer(lats1, &latdata, &buflenlats) <> 0:
  *             raise RuntimeError
  *         if PyObject_AsWriteBuffer(lons2, &azdat, &buflenaz) <> 0:             # <<<<<<<<<<<<<< 
@@ -1061,7 +1061,7 @@
   __pyx_1 = (PyObject_AsWriteBuffer(__pyx_v_lons2,(&__pyx_v_azdat),(&__pyx_v_buflenaz)) != 0);
   if (__pyx_1) {
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":99
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":99
  *             raise RuntimeError
  *         if PyObject_AsWriteBuffer(lons2, &azdat, &buflenaz) <> 0:
  *             raise RuntimeError             # <<<<<<<<<<<<<< 
@@ -1074,7 +1074,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":100
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":100
  *         if PyObject_AsWriteBuffer(lons2, &azdat, &buflenaz) <> 0:
  *             raise RuntimeError
  *         if PyObject_AsWriteBuffer(lats2, &distdat, &buflend) <> 0:             # <<<<<<<<<<<<<< 
@@ -1084,7 +1084,7 @@
   __pyx_1 = (PyObject_AsWriteBuffer(__pyx_v_lats2,(&__pyx_v_distdat),(&__pyx_v_buflend)) != 0);
   if (__pyx_1) {
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":101
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":101
  *             raise RuntimeError
  *         if PyObject_AsWriteBuffer(lats2, &distdat, &buflend) <> 0:
  *             raise RuntimeError             # <<<<<<<<<<<<<< 
@@ -1097,7 +1097,7 @@
   }
   __pyx_L5:;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":103
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":103
  *             raise RuntimeError
  *         # process data in buffer
  *         if not buflenlons == buflenlats == buflenaz == buflend:             # <<<<<<<<<<<<<< 
@@ -1114,7 +1114,7 @@
   __pyx_2 = (!__pyx_1);
   if (__pyx_2) {
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":104
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":104
  *         # process data in buffer
  *         if not buflenlons == buflenlats == buflenaz == buflend:
  *             raise RuntimeError("Buffer lengths not the same")             # <<<<<<<<<<<<<< 
@@ -1133,7 +1133,7 @@
   }
   __pyx_L6:;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":105
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":105
  *         if not buflenlons == buflenlats == buflenaz == buflend:
  *             raise RuntimeError("Buffer lengths not the same")
  *         ndim = buflenlons/_doublesize             # <<<<<<<<<<<<<< 
@@ -1149,7 +1149,7 @@
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   __pyx_v_ndim = __pyx_6;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":106
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":106
  *             raise RuntimeError("Buffer lengths not the same")
  *         ndim = buflenlons/_doublesize
  *         lonsdata = <double *>londata             # <<<<<<<<<<<<<< 
@@ -1158,7 +1158,7 @@
  */
   __pyx_v_lonsdata = ((double (*))__pyx_v_londata);
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":107
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":107
  *         ndim = buflenlons/_doublesize
  *         lonsdata = <double *>londata
  *         latsdata = <double *>latdata             # <<<<<<<<<<<<<< 
@@ -1167,7 +1167,7 @@
  */
   __pyx_v_latsdata = ((double (*))__pyx_v_latdata);
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":108
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":108
  *         lonsdata = <double *>londata
  *         latsdata = <double *>latdata
  *         azdata = <double *>azdat             # <<<<<<<<<<<<<< 
@@ -1176,7 +1176,7 @@
  */
   __pyx_v_azdata = ((double (*))__pyx_v_azdat);
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":109
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":109
  *         latsdata = <double *>latdata
  *         azdata = <double *>azdat
  *         distdata = <double *>distdat             # <<<<<<<<<<<<<< 
@@ -1185,7 +1185,7 @@
  */
   __pyx_v_distdata = ((double (*))__pyx_v_distdat);
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":110
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":110
  *         azdata = <double *>azdat
  *         distdata = <double *>distdat
  *         for i from 0 <= i < ndim:             # <<<<<<<<<<<<<< 
@@ -1194,7 +1194,7 @@
  */
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_ndim; __pyx_v_i++) {
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":111
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":111
  *         distdata = <double *>distdat
  *         for i from 0 <= i < ndim:
  *             if radians:             # <<<<<<<<<<<<<< 
@@ -1204,7 +1204,7 @@
     __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_v_radians); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 111; goto __pyx_L1;}
     if (__pyx_1) {
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":112
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":112
  *         for i from 0 <= i < ndim:
  *             if radians:
  *                 self.geodesic_t.p1.v = lonsdata[i]             # <<<<<<<<<<<<<< 
@@ -1213,7 +1213,7 @@
  */
       ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.v = (__pyx_v_lonsdata[__pyx_v_i]);
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":113
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":113
  *             if radians:
  *                 self.geodesic_t.p1.v = lonsdata[i]
  *                 self.geodesic_t.p1.u = latsdata[i]             # <<<<<<<<<<<<<< 
@@ -1222,7 +1222,7 @@
  */
       ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.u = (__pyx_v_latsdata[__pyx_v_i]);
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":114
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":114
  *                 self.geodesic_t.p1.v = lonsdata[i]
  *                 self.geodesic_t.p1.u = latsdata[i]
  *                 self.geodesic_t.p2.v = azdata[i]             # <<<<<<<<<<<<<< 
@@ -1231,7 +1231,7 @@
  */
       ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p2.v = (__pyx_v_azdata[__pyx_v_i]);
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":115
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":115
  *                 self.geodesic_t.p1.u = latsdata[i]
  *                 self.geodesic_t.p2.v = azdata[i]
  *                 self.geodesic_t.p2.u = distdata[i]             # <<<<<<<<<<<<<< 
@@ -1243,7 +1243,7 @@
     }
     /*else*/ {
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":117
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":117
  *                 self.geodesic_t.p2.u = distdata[i]
  *             else:
  *                 self.geodesic_t.p1.v = _dg2rad*lonsdata[i]             # <<<<<<<<<<<<<< 
@@ -1259,7 +1259,7 @@
       Py_DECREF(__pyx_5); __pyx_5 = 0;
       ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.v = __pyx_7;
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":118
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":118
  *             else:
  *                 self.geodesic_t.p1.v = _dg2rad*lonsdata[i]
  *                 self.geodesic_t.p1.u = _dg2rad*latsdata[i]             # <<<<<<<<<<<<<< 
@@ -1275,7 +1275,7 @@
       Py_DECREF(__pyx_5); __pyx_5 = 0;
       ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.u = __pyx_7;
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":119
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":119
  *                 self.geodesic_t.p1.v = _dg2rad*lonsdata[i]
  *                 self.geodesic_t.p1.u = _dg2rad*latsdata[i]
  *                 self.geodesic_t.p2.v = _dg2rad*azdata[i]             # <<<<<<<<<<<<<< 
@@ -1291,7 +1291,7 @@
       Py_DECREF(__pyx_5); __pyx_5 = 0;
       ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p2.v = __pyx_7;
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":120
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":120
  *                 self.geodesic_t.p1.u = _dg2rad*latsdata[i]
  *                 self.geodesic_t.p2.v = _dg2rad*azdata[i]
  *                 self.geodesic_t.p2.u = _dg2rad*distdata[i]             # <<<<<<<<<<<<<< 
@@ -1309,7 +1309,7 @@
     }
     __pyx_L9:;
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":121
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":121
  *                 self.geodesic_t.p2.v = _dg2rad*azdata[i]
  *                 self.geodesic_t.p2.u = _dg2rad*distdata[i]
  *             geod_inv(&self.geodesic_t)             # <<<<<<<<<<<<<< 
@@ -1318,7 +1318,7 @@
  */
     geod_inv((&((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t));
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":122
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":122
  *                 self.geodesic_t.p2.u = _dg2rad*distdata[i]
  *             geod_inv(&self.geodesic_t)
  *             if isnan(self.geodesic_t.DIST):             # <<<<<<<<<<<<<< 
@@ -1328,7 +1328,7 @@
     __pyx_8 = isnan(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.DIST);
     if (__pyx_8) {
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":123
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":123
  *             geod_inv(&self.geodesic_t)
  *             if isnan(self.geodesic_t.DIST):
  *                 raise ValueError('undefined inverse geodesic (may be an antipodal point)')             # <<<<<<<<<<<<<< 
@@ -1347,7 +1347,7 @@
     }
     __pyx_L10:;
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":124
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":124
  *             if isnan(self.geodesic_t.DIST):
  *                 raise ValueError('undefined inverse geodesic (may be an antipodal point)')
  *             if pj_errno != 0:             # <<<<<<<<<<<<<< 
@@ -1357,7 +1357,7 @@
     __pyx_2 = (pj_errno != 0);
     if (__pyx_2) {
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":125
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":125
  *                 raise ValueError('undefined inverse geodesic (may be an antipodal point)')
  *             if pj_errno != 0:
  *                 raise RuntimeError(pj_strerrno(pj_errno))             # <<<<<<<<<<<<<< 
@@ -1377,7 +1377,7 @@
     }
     __pyx_L11:;
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":126
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":126
  *             if pj_errno != 0:
  *                 raise RuntimeError(pj_strerrno(pj_errno))
  *             if radians:             # <<<<<<<<<<<<<< 
@@ -1387,7 +1387,7 @@
     __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_v_radians); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; goto __pyx_L1;}
     if (__pyx_1) {
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":127
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":127
  *                 raise RuntimeError(pj_strerrno(pj_errno))
  *             if radians:
  *                 lonsdata[i] = self.geodesic_t.ALPHA12             # <<<<<<<<<<<<<< 
@@ -1396,7 +1396,7 @@
  */
       (__pyx_v_lonsdata[__pyx_v_i]) = ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.ALPHA12;
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":128
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":128
  *             if radians:
  *                 lonsdata[i] = self.geodesic_t.ALPHA12
  *                 latsdata[i] = self.geodesic_t.ALPHA21             # <<<<<<<<<<<<<< 
@@ -1408,7 +1408,7 @@
     }
     /*else*/ {
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":130
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":130
  *                 latsdata[i] = self.geodesic_t.ALPHA21
  *             else:
  *                 lonsdata[i] = _rad2dg*self.geodesic_t.ALPHA12             # <<<<<<<<<<<<<< 
@@ -1424,7 +1424,7 @@
       Py_DECREF(__pyx_4); __pyx_4 = 0;
       (__pyx_v_lonsdata[__pyx_v_i]) = __pyx_7;
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":131
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":131
  *             else:
  *                 lonsdata[i] = _rad2dg*self.geodesic_t.ALPHA12
  *                 latsdata[i] = _rad2dg*self.geodesic_t.ALPHA21             # <<<<<<<<<<<<<< 
@@ -1442,7 +1442,7 @@
     }
     __pyx_L12:;
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":132
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":132
  *                 lonsdata[i] = _rad2dg*self.geodesic_t.ALPHA12
  *                 latsdata[i] = _rad2dg*self.geodesic_t.ALPHA21
  *             azdata[i] = self.geodesic_t.DIST             # <<<<<<<<<<<<<< 
@@ -1498,7 +1498,7 @@
   __pyx_v_lats = Py_None; Py_INCREF(Py_None);
   __pyx_v_lons = Py_None; Py_INCREF(Py_None);
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":139
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":139
  *         cdef int i
  *         cdef double del_s
  *         if radians:             # <<<<<<<<<<<<<< 
@@ -1508,7 +1508,7 @@
   __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_v_radians); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; goto __pyx_L1;}
   if (__pyx_1) {
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":140
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":140
  *         cdef double del_s
  *         if radians:
  *             self.geodesic_t.p1.v = lon1             # <<<<<<<<<<<<<< 
@@ -1517,7 +1517,7 @@
  */
     ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.v = __pyx_v_lon1;
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":141
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":141
  *         if radians:
  *             self.geodesic_t.p1.v = lon1
  *             self.geodesic_t.p1.u = lat1             # <<<<<<<<<<<<<< 
@@ -1526,7 +1526,7 @@
  */
     ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.u = __pyx_v_lat1;
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":142
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":142
  *             self.geodesic_t.p1.v = lon1
  *             self.geodesic_t.p1.u = lat1
  *             self.geodesic_t.p2.v = lon2             # <<<<<<<<<<<<<< 
@@ -1535,7 +1535,7 @@
  */
     ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p2.v = __pyx_v_lon2;
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":143
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":143
  *             self.geodesic_t.p1.u = lat1
  *             self.geodesic_t.p2.v = lon2
  *             self.geodesic_t.p2.u = lat2             # <<<<<<<<<<<<<< 
@@ -1547,7 +1547,7 @@
   }
   /*else*/ {
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":145
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":145
  *             self.geodesic_t.p2.u = lat2
  *         else:
  *             self.geodesic_t.p1.v = _dg2rad*lon1             # <<<<<<<<<<<<<< 
@@ -1563,7 +1563,7 @@
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.v = __pyx_5;
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":146
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":146
  *         else:
  *             self.geodesic_t.p1.v = _dg2rad*lon1
  *             self.geodesic_t.p1.u = _dg2rad*lat1             # <<<<<<<<<<<<<< 
@@ -1579,7 +1579,7 @@
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.u = __pyx_5;
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":147
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":147
  *             self.geodesic_t.p1.v = _dg2rad*lon1
  *             self.geodesic_t.p1.u = _dg2rad*lat1
  *             self.geodesic_t.p2.v = _dg2rad*lon2             # <<<<<<<<<<<<<< 
@@ -1595,7 +1595,7 @@
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p2.v = __pyx_5;
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":148
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":148
  *             self.geodesic_t.p1.u = _dg2rad*lat1
  *             self.geodesic_t.p2.v = _dg2rad*lon2
  *             self.geodesic_t.p2.u = _dg2rad*lat2             # <<<<<<<<<<<<<< 
@@ -1613,7 +1613,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":150
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":150
  *             self.geodesic_t.p2.u = _dg2rad*lat2
  *         # do inverse computation to set azimuths, distance.
  *         geod_inv(&self.geodesic_t)             # <<<<<<<<<<<<<< 
@@ -1622,7 +1622,7 @@
  */
   geod_inv((&((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t));
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":152
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":152
  *         geod_inv(&self.geodesic_t)
  *         # set up some constants needed for forward computation.
  *         geod_pre(&self.geodesic_t)             # <<<<<<<<<<<<<< 
@@ -1631,7 +1631,7 @@
  */
   geod_pre((&((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t));
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":154
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":154
  *         geod_pre(&self.geodesic_t)
  *         # distance increment.
  *         del_s = self.geodesic_t.DIST/(npts+1)             # <<<<<<<<<<<<<< 
@@ -1640,7 +1640,7 @@
  */
   __pyx_v_del_s = (((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.DIST / (__pyx_v_npts + 1));
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":156
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":156
  *         del_s = self.geodesic_t.DIST/(npts+1)
  *         # initialize output tuples.
  *         lats = ()             # <<<<<<<<<<<<<< 
@@ -1652,7 +1652,7 @@
   __pyx_v_lats = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":157
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":157
  *         # initialize output tuples.
  *         lats = ()
  *         lons = ()             # <<<<<<<<<<<<<< 
@@ -1664,7 +1664,7 @@
   __pyx_v_lons = __pyx_3;
   __pyx_3 = 0;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":159
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":159
  *         lons = ()
  *         # loop over intermediate points, compute lat/lons.
  *         for i from 1 <= i < npts+1:             # <<<<<<<<<<<<<< 
@@ -1674,7 +1674,7 @@
   __pyx_6 = (__pyx_v_npts + 1);
   for (__pyx_v_i = 1; __pyx_v_i < __pyx_6; __pyx_v_i++) {
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":160
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":160
  *         # loop over intermediate points, compute lat/lons.
  *         for i from 1 <= i < npts+1:
  *             self.geodesic_t.DIST = i*del_s             # <<<<<<<<<<<<<< 
@@ -1683,7 +1683,7 @@
  */
     ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.DIST = (__pyx_v_i * __pyx_v_del_s);
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":161
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":161
  *         for i from 1 <= i < npts+1:
  *             self.geodesic_t.DIST = i*del_s
  *             geod_for(&self.geodesic_t)             # <<<<<<<<<<<<<< 
@@ -1692,7 +1692,7 @@
  */
     geod_for((&((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t));
 
-    /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":162
+    /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":162
  *             self.geodesic_t.DIST = i*del_s
  *             geod_for(&self.geodesic_t)
  *             if radians:             # <<<<<<<<<<<<<< 
@@ -1702,7 +1702,7 @@
     __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_v_radians); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 162; goto __pyx_L1;}
     if (__pyx_1) {
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":163
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":163
  *             geod_for(&self.geodesic_t)
  *             if radians:
  *                 lats = lats + (self.geodesic_t.p2.u,)             # <<<<<<<<<<<<<< 
@@ -1719,7 +1719,7 @@
       __pyx_v_lats = __pyx_3;
       __pyx_3 = 0;
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":164
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":164
  *             if radians:
  *                 lats = lats + (self.geodesic_t.p2.u,)
  *                 lons = lons + (self.geodesic_t.p2.v,)             # <<<<<<<<<<<<<< 
@@ -1739,7 +1739,7 @@
     }
     /*else*/ {
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":166
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":166
  *                 lons = lons + (self.geodesic_t.p2.v,)
  *             else:
  *                 lats = lats + (_rad2dg*self.geodesic_t.p2.u,)             # <<<<<<<<<<<<<< 
@@ -1760,7 +1760,7 @@
       __pyx_v_lats = __pyx_2;
       __pyx_2 = 0;
 
-      /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":167
+      /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":167
  *             else:
  *                 lats = lats + (_rad2dg*self.geodesic_t.p2.u,)
  *                 lons = lons + (_rad2dg*self.geodesic_t.p2.v,)             # <<<<<<<<<<<<<< 
@@ -1783,7 +1783,7 @@
     __pyx_L5:;
   }
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":168
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":168
  *                 lats = lats + (_rad2dg*self.geodesic_t.p2.u,)
  *                 lons = lons + (_rad2dg*self.geodesic_t.p2.v,)
  *         return lons, lats             # <<<<<<<<<<<<<< 
@@ -2046,7 +2046,7 @@
   if (PyObject_SetAttrString(__pyx_m, "Geod", (PyObject *)&__pyx_type_5_geod_Geod) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 5; goto __pyx_L1;}
   __pyx_ptype_5_geod_Geod = &__pyx_type_5_geod_Geod;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_pyproj.pxi":1
+  /* "/private/tmp/toolkits/basemap-testing/src/_pyproj.pxi":1
  * import math             # <<<<<<<<<<<<<< 
  * 
  * _dg2rad = math.radians(1.)
@@ -2055,7 +2055,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_math, __pyx_1) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 1; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_pyproj.pxi":3
+  /* "/private/tmp/toolkits/basemap-testing/src/_pyproj.pxi":3
  * import math
  * 
  * _dg2rad = math.radians(1.)             # <<<<<<<<<<<<<< 
@@ -2075,7 +2075,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n__dg2rad, __pyx_1) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 3; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_pyproj.pxi":4
+  /* "/private/tmp/toolkits/basemap-testing/src/_pyproj.pxi":4
  * 
  * _dg2rad = math.radians(1.)
  * _rad2dg = math.degrees(1.)             # <<<<<<<<<<<<<< 
@@ -2095,7 +2095,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n__rad2dg, __pyx_1) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 4; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_pyproj.pxi":5
+  /* "/private/tmp/toolkits/basemap-testing/src/_pyproj.pxi":5
  * _dg2rad = math.radians(1.)
  * _rad2dg = math.degrees(1.)
  * _doublesize = sizeof(double)             # <<<<<<<<<<<<<< 
@@ -2106,7 +2106,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n__doublesize, __pyx_3) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 5; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_pyproj.pxi":6
+  /* "/private/tmp/toolkits/basemap-testing/src/_pyproj.pxi":6
  * _rad2dg = math.degrees(1.)
  * _doublesize = sizeof(double)
  * __version__ = "1.8.3"             # <<<<<<<<<<<<<< 
@@ -2115,7 +2115,7 @@
  */
   if (PyObject_SetAttr(__pyx_m, __pyx_n___version__, __pyx_k2p) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 6; goto __pyx_L1;}
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":29
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":29
  *         return (self.__class__,(self.geodparams,))
  * 
  *     def _fwd(self, object lons, object lats, object az, object dist, radians=False):             # <<<<<<<<<<<<<< 
@@ -2125,7 +2125,7 @@
   Py_INCREF(Py_False);
   __pyx_k3 = Py_False;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":84
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":84
  *                 azdata[i] = _rad2dg*self.geodesic_t.ALPHA21
  * 
  *     def _inv(self, object lons1, object lats1, object lons2, object lats2, radians=False):             # <<<<<<<<<<<<<< 
@@ -2135,7 +2135,7 @@
   Py_INCREF(Py_False);
   __pyx_k4 = Py_False;
 
-  /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":134
+  /* "/private/tmp/toolkits/basemap-testing/src/_geod.pyx":134
  *             azdata[i] = self.geodesic_t.DIST
  * 
  *     def _npts(self, double lon1, double lat1, double lon2, double lat2, int npts, radians=False):             # <<<<<<<<<<<<<< 

Modified: trunk/toolkits/basemap-testing/src/_proj.c
===================================================================
--- trunk/toolkits/basemap-testing/src/_proj.c	2007-11-01 03:18:09 UTC (rev 4076)
+++ trunk/toolkits/basemap-testing/src/_proj.c	2007-11-01 03:22:40 UTC (rev 4077)
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.9.6.7 on Sun Oct 28 13:19:08 2007 */
+/* Generated by Cython 0.9.6.7 on Wed Oct 31 21:20:52 2007 */
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
@@ -25,7 +25,6 @@
 #include "math.h"
 #include "geodesic.h"
 #include "proj_api.h"
-#include "numpy/arrayobject.h"
 
 
 #ifdef __GNUC__
@@ -85,17 +84,8 @@
 
 static int __Pyx_InitStrings(__Pyx_StringTabEntry *t); /*proto*/
 
-static PyTypeObject *__Pyx_ImportType(char *module_name, char *class_name, long size);  /*proto*/
-
 static void __Pyx_AddTraceback(char *funcname); /*proto*/
 
-/* Declarations from c_numpy */
-
-static PyTypeObject *__pyx_ptype_7c_numpy_dtype = 0;
-static PyTypeObject *__pyx_ptype_7c_numpy_ndarray = 0;
-static PyTypeObject *__pyx_ptype_7c_numpy_flatiter = 0;
-static PyTypeObject *__pyx_ptype_7c_numpy_broadcast = 0;
-
 /* Declarations from _proj */
 
 
@@ -109,22 +99,16 @@
 };
 
 static PyTypeObject *__pyx_ptype_5_proj_Proj = 0;
+static PyObject *__pyx_k3;
 static PyObject *__pyx_k4;
 static PyObject *__pyx_k5;
 static PyObject *__pyx_k6;
-static PyObject *__pyx_k7;
-static PyObject *__pyx_k8;
-static PyObject *__pyx_k9;
-static PyObject *__pyx_k10;
-static PyObject *__pyx_k11;
 
 
 /* Implementation of _proj */
 
-static char (__pyx_k3[]) = "1.8.3";
+static char (__pyx_k2[]) = "1.8.3";
 
-static PyObject *__pyx_n_c_numpy;
-static PyObject *__pyx_n_numpy;
 static PyObject *__pyx_n_math;
 static PyObject *__pyx_n__dg2rad;
 static PyObject *__pyx_n__rad2dg;
@@ -135,8 +119,6 @@
 static PyObject *__pyx_n___dealloc__;
 static PyObject *__pyx_n___reduce__;
 static PyObject *__pyx_n__fwd;
-static PyObject *__pyx_n__fwdn;
-static PyObject *__pyx_n__invn;
 static PyObject *__pyx_n__inv;
 static PyObject *__pyx_n_is_latlong;
 static PyObject *__pyx_n_is_geocent;
@@ -144,7 +126,7 @@
 static PyObject *__pyx_n_radians;
 static PyObject *__pyx_n_degrees;
 
-static PyObject *__pyx_k3p;
+static PyObject *__pyx_k2p;
 
 static PyObject *__pyx_f_py_5_proj_set_datapath(PyObject *__pyx_self, PyObject *__pyx_v_datapath); /*proto*/
 static PyObject *__pyx_f_py_5_proj_set_datapath(PyObject *__pyx_self, PyObject *__pyx_v_datapath) {
@@ -152,20 +134,20 @@
   PyObject *__pyx_r;
   Py_INCREF(__pyx_v_datapath);
 
-  /* "/home/efiring/programs/py/mpl/basemap.dev/src/_proj.pyx":11
+  /* "/private/tmp/toolkits/basemap-testing/src/_proj.pyx":7
  * def set_datapath(datapath):
  *     cdef char *searchpath
  *     searchpath = PyString_AsString(datapath)             # <<<<<<<<<<<<<< 
  *     pj_set_searchpath(1, &searchpath)
- * 
+ *     
  */
   __pyx_v_searchpath = PyString_AsString(__pyx_v_datapath);
 
-  /* "/home/efiring/programs/py/mpl/basemap.dev/src/_proj.pyx":12
+  /* "/private/tmp/toolkits/basemap-testing/src/_proj.pyx":8
  *     cdef char *searchpath
  *     searchpath = PyString_AsString(datapath)
  *     pj_set_searchpath(1, &searchpath)             # <<<<<<<<<<<<<< 
- * 
+ *     
  * cdef class Proj:
  */
   pj_set_searchpath(1,(&__pyx_v_searchpath));
@@ -180,17 +162,17 @@
 static PyObject *__pyx_n_join;
 static PyObject *__pyx_n_RuntimeError;
 
-static PyObject *__pyx_k12p;
-static PyObject *__pyx_k13p;
-static PyObject *__pyx_k14p;
-static PyObject *__pyx_k15p;
+static PyObject *__pyx_k7p;
+static PyObject *__pyx_k8p;
+static PyObject *__pyx_k9p;
+static PyObject *__pyx_k10p;
 
 static PyObject *__pyx_builtin_RuntimeError;
 
-static char (__pyx_k12[]) = "+";
-static char (__pyx_k13[]) = "=";
-static char (__pyx_k14[]) = " ";
-static char (__pyx_k15[]) = "";
+static char (__pyx_k7[]) = "+";
+static char (__pyx_k8[]) = "=";
+static char (__pyx_k9[]) = " ";
+static char (__pyx_k10[]) = "";
 
 static int __pyx_f_py_5_proj_4Proj___new__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static int __pyx_f_py_5_proj_4Proj___new__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -214,7 +196,7 @@
   __pyx_v_key = Py_None; Py_INCREF(Py_None);
   __pyx_v_value = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/efiring/programs/py/mpl/basemap.dev/src/_proj.pyx":22
+  /* "/private/tmp/toolkits/basemap-testing/src/_proj.pyx":18
  * 
  *     def __new__(self, projparams):
  *         self.projparams = projparams             # <<<<<<<<<<<<<< 
@@ -225,30 +207,30 @@
   Py_DECREF(((struct __pyx_obj_5_proj_Proj *)__pyx_v_self)->projparams);
   ((struct __pyx_obj_5_proj_Proj *)__pyx_v_self)->projparams = __pyx_v_projparams;
 
-  /* "/home/efiring/programs/py/mpl/basemap.dev/src/_proj.pyx":24
+  /* "/private/tmp/toolkits/basemap-testing/src/_proj.pyx":20
  *         self.projparams = projparams
  *         # setup proj initialization string.
  *         pjargs = []             # <<<<<<<<<<<<<< 
  *         for key,value in projparams.iteritems():
  *             pjargs.append('+'+key+"="+str(value)+' ')
  */
-  __pyx_1 = PyList_New(0); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; goto __pyx_L1;}
+  __pyx_1 = PyList_New(0); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 20; goto __pyx_L1;}
   Py_DECREF(__pyx_v_pjargs);
   __pyx_v_pjargs = __pyx_1;
   __pyx_1 = 0;
 
-  /* "/home/efiring/programs/py/mpl/basemap.dev/src/_proj.pyx":25
+  /* "/private/tmp/toolkits/basemap-testing/src/_proj.pyx":21
  *         # setup proj initialization string.
  *         pjargs = []
  *         for key,value in projparams.iteritems():             # <<<<<<<<<<<<<< 
  *             pjargs.append('+'+key+"="+str(value)+' ')
  *         self.srs = ''.join(pjargs)
  */
-  __pyx_1 = PyObject_GetAttr(__pyx_v_projparams, __pyx_n_iteritems); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; goto __pyx_L1;}
-  __pyx_3 = PyObject_CallObject(__pyx_1, 0); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; goto __pyx_L1;}
+  __pyx_1 = PyObject_GetAttr(__pyx_v_projparams, __pyx_n_iteritems); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 21; goto __pyx_L1;}
+  __pyx_3 = PyObject_CallObject(__pyx_1, 0); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 21; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyList_CheckExact(__pyx_3)) { __pyx_2 = 0; __pyx_1 = __pyx_3; Py_INCREF(__pyx_1); }
-  else { __pyx_1 = PyObject_GetIter(__pyx_3); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; goto __pyx_L1;} }
+  else { __pyx_1 = PyObject_GetIter(__pyx_3); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 21; goto __pyx_L1;} }
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   for (;;) {
     if (PyList_CheckExact(__pyx_1)) { if (__pyx_2 >= PyList_GET_SIZE(__pyx_1)) break; __pyx_3 = PyList_GET_ITEM(__pyx_1, __pyx_2++); Py_INCREF(__pyx_3); }
@@ -272,70 +254,70 @@
       Py_DECREF(__pyx_3); __pyx_3 = 0;
     }
     else {
-      __pyx_4 = PyObject_GetIter(__pyx_3); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; goto __pyx_L1;}
+      __pyx_4 = PyObject_GetIter(__pyx_3); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 21; goto __pyx_L1;}
       Py_DECREF(__pyx_3); __pyx_3 = 0;
-      __pyx_5 = __Pyx_UnpackItem(__pyx_4); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; goto __pyx_L1;}
+      __pyx_5 = __Pyx_UnpackItem(__pyx_4); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 21; goto __pyx_L1;}
       Py_DECREF(__pyx_v_key);
       __pyx_v_key = __pyx_5;
       __pyx_5 = 0;
-      __pyx_5 = __Pyx_UnpackItem(__pyx_4); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; goto __pyx_L1;}
+      __pyx_5 = __Pyx_UnpackItem(__pyx_4); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 21; goto __pyx_L1;}
       Py_DECREF(__pyx_v_value);
       __pyx_v_value = __pyx_5;
       __pyx_5 = 0;
-      if (__Pyx_EndUnpack(__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; goto __pyx_L1;}
+      if (__Pyx_EndUnpack(__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 21; goto __pyx_L1;}
       Py_DECREF(__pyx_4); __pyx_4 = 0;
     }
 
-    /* "/home/efiring/programs/py/mpl/basemap.dev/src/_proj.pyx":26
+    /* "/private/tmp/toolkits/basemap-testing/src/_proj.pyx":22
  *         pjargs = []
  *         for key,value in projparams.iteritems():
  *             pjargs.append('+'+key+"="+str(value)+' ')             # <<<<<<<<<<<<<< 
  *         self.srs = ''.join(pjargs)
  *         self.pjinitstring = PyString_AsString(self.srs)
  */
-    __pyx_5 = PyObject_GetAttr(__pyx_v_pjargs, __pyx_n_append); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; goto __pyx_L1;}
-    __pyx_3 = PyNumber_Add(__pyx_k12p, __pyx_v_key); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; goto __pyx_L1;}
-    __pyx_4 = PyNumber_Add(__pyx_3, __pyx_k13p); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; goto __pyx_L1;}
+    __pyx_5 = PyObject_GetAttr(__pyx_v_pjargs, __pyx_n_append); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 22; goto __pyx_L1;}
+    __pyx_3 = PyNumber_Add(__pyx_k7p, __pyx_v_key); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 22; goto __pyx_L1;}
+    __pyx_4 = PyNumber_Add(__pyx_3, __pyx_k8p); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 22; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
-    __pyx_3 = PyTuple_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; goto __pyx_L1;}
+    __pyx_3 = PyTuple_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 22; goto __pyx_L1;}
     Py_INCREF(__pyx_v_value);
     PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_value);
-    __pyx_6 = PyObject_CallObject(((PyObject*)&PyString_Type), __pyx_3); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; goto __pyx_L1;}
+    __pyx_6 = PyObject_CallObject(((PyObject*)&PyString_Type), __pyx_3); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 22; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
-    __pyx_3 = PyNumber_Add(__pyx_4, __pyx_6); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; goto __pyx_L1;}
+    __pyx_3 = PyNumber_Add(__pyx_4, __pyx_6); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 22; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_6); __pyx_6 = 0;
-    __pyx_4 = PyNumber_Add(__pyx_3, __pyx_k14p); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; goto __pyx_L1;}
+    __pyx_4 = PyNumber_Add(__pyx_3, __pyx_k9p); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 22; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
-    __pyx_6 = PyTuple...
 
[truncated message content]

Thread: SF.net SVN: matplotlib: [4077] trunk/toolkits/basemap-testing/src

matplotlib-checkins