Merge pull request #93 from jswhit/master

fix drawcounties for python 3.3

Author: Jeff Whitaker

Changelog

@@ -1,5 +1,6 @@
 version 1.0.6 (not yet released)
 --------------------------------
+* fix drawcounties for Python 3.3.
 * update pyproj to version 1.9.3 (remove geographiclib python code, replace
   with C code from proj4).
 * in contourf and contour, all points outside the map projection

lib/mpl_toolkits/basemap/__init__.py

@@ -1916,7 +1916,8 @@ def drawcounties(self,linewidth=0.1,linestyle='solid',color='k',antialiased=1,
         """
         ax = ax or self._check_ax()
         gis_file = os.path.join(basemap_datadir,'UScounties')
-        county_info = self.readshapefile(gis_file,'counties',drawbounds=drawbounds)
+        county_info = self.readshapefile(gis_file,'counties',\
+                      default_encoding='latin-1',drawbounds=drawbounds)
         counties = [coords for coords in self.counties]
         counties = LineCollection(counties)
         counties.set_linestyle(linestyle)
@@ -1991,7 +1992,8 @@ def is_land(self,xpt,ypt):
         return landpt and not lakept
 
     def readshapefile(self,shapefile,name,drawbounds=True,zorder=None,
-                      linewidth=0.5,color='k',antialiased=1,ax=None):
+                      linewidth=0.5,color='k',antialiased=1,ax=None,
+                      default_encoding='utf-8'):
         """
         Read in shape file, optionally draw boundaries on map.
 
@@ -2055,7 +2057,9 @@ def readshapefile(self,shapefile,name,drawbounds=True,zorder=None,
         vertices. If ``drawbounds=True`` a
         matplotlib.patches.LineCollection object is appended to the tuple.
         """
+        import shapefile as shp
         from .shapefile import Reader
+        shp.default_encoding = default_encoding
         if not os.path.exists('%s.shp'%shapefile):
             raise IOError('cannot locate %s.shp'%shapefile)
         if not os.path.exists('%s.shx'%shapefile):

lib/mpl_toolkits/basemap/shapefile.py

@@ -14,6 +14,7 @@
 import array
 #
 # Constants for shape types
+default_encoding = 'utf-8'
 NULL = 0
 POINT = 1
 POLYLINE = 3
@@ -35,7 +36,7 @@ def b(v):
     if PYTHON3:
         if isinstance(v, str):
             # For python 3 encode str to bytes.
-            return v.encode('utf-8')
+            return v.encode(default_encoding)
         elif isinstance(v, bytes):
             # Already bytes.
             return v
@@ -50,7 +51,7 @@ def u(v):
     if PYTHON3:
         if isinstance(v, bytes):
             # For python 3 decode bytes to str.
-            return v.decode('utf-8')
+            return v.decode(default_encoding)
         elif isinstance(v, str):
             # Already str.
             return v