diff --git a/MANIFEST b/MANIFEST old mode 100755 new mode 100644 diff --git a/README b/README old mode 100755 new mode 100644 index 79ea53c..137b080 --- a/README +++ b/README @@ -13,8 +13,8 @@ pip install --user -e git+https://github.com/brorfred/projmap.git#egg=projmap = Define a project in one of the following files: = -./region_maps.cfg -~/.region_maps.cfg +./map_regions.cfg +~/.map_regions.cfg An example project can look like this: @@ -25,24 +25,24 @@ base.llcrnrlon: -70 # All keywords can be used base.llcrnrlat: -60 # Read more at base.urcrnrlat: -20 # http://matplotlib.org/basemap/users/mapsetup.html base.urcrnrlon: 30 # -base.lat_0: -40 # Remember to begin all keyworrds with 'base.' +base.lat_0: -40 # Remember to begin all keywords with 'base.' base.lon_0: 0 # -base.resolution: i # +base.resolution: i # proj.merid: [-60, -40, -20, 0, 20, 40] # Where to draw meridians -proj.paral: [-60, -50, -40, -30] # Where to drar parallels +proj.paral: [-60, -50, -40, -30] # Where to draw parallels Example of usage: ->>> import projmap +>>> import projmap >>> >>> #list all available regions ->>> projmap.list() +>>> projmap.list() >>> #lists all settings for a region ->>> projmap.list(' #handle') +>>> projmap.list(' #handle') >>> >>> #Create a map instance >>> mp = projmap.Projmap('handle') >>> >>> #Make a nice looking map ->>> mp.nice() \ No newline at end of file +>>> mp.nice() diff --git a/projmap/__init__.py b/projmap/__init__.py old mode 100755 new mode 100644 index f9e1546..03f73ac --- a/projmap/__init__.py +++ b/projmap/__init__.py @@ -1,4 +1,4 @@ -from __future__ import print_function + """A wrapper for the mpl_toolkit Basemap class Projmap helps with setting up projections and domains for areas diff --git a/projmap/basemap.py b/projmap/basemap.py old mode 100755 new mode 100644 index 4152822..9f6d958 --- a/projmap/basemap.py +++ b/projmap/basemap.py @@ -1,4 +1,4 @@ -from __future__ import print_function + """ Add presets to matplotlib/basemap Projmap is a wrapper to matplotlib's Basemap module to make the usage @@ -52,14 +52,14 @@ def openfile(fname): def splitkey(key, val): if "base." in key: basekey = key[5:] - if basekey in self.inkwargs.keys(): + if basekey in list(self.inkwargs.keys()): self.base_kwargs[basekey] = self.inkwargs[basekey] del self.inkwargs[basekey] else: self.base_kwargs[basekey] = val elif "proj." in key: selfkey = key[5:] - if selfkey in self.inkwargs.keys(): + if selfkey in list(self.inkwargs.keys()): self.__dict__[selfkey] = self.inkwargs[selfkey] del self.inkwargs[selfkey] else: @@ -78,7 +78,7 @@ def splitkey(key, val): def nice(self,latlabels=True,lonlabels=True): """ Draw land, parallells and meridians on a map""" def alpha(lH): - for l in lH.items(): + for l in list(lH.items()): l[1][0][0].set_alpha(0.5) if hasattr(self, "latlabels"): latlabels = self.latlabels @@ -149,7 +149,7 @@ def line(lons, lats): line([lon2]*step, np.linspace(lat2,lat1,step)) line(np.linspace(lon2,lon1,step), [lat2]*step) if shading: - p = pl.Polygon(zip(pos.x, pos.y),facecolor=shading, edgecolor=c, + p = pl.Polygon(list(zip(pos.x, pos.y)),facecolor=shading, edgecolor=c, alpha=0.5,linewidth=1) pl.gca().add_patch(p) diff --git a/projmap/data/pf.txt b/projmap/data/pf.txt old mode 100755 new mode 100644 diff --git a/projmap/data/saccf.txt b/projmap/data/saccf.txt old mode 100755 new mode 100644 diff --git a/projmap/data/saf.txt b/projmap/data/saf.txt old mode 100755 new mode 100644 diff --git a/projmap/data/sbdy.txt b/projmap/data/sbdy.txt old mode 100755 new mode 100644 diff --git a/projmap/data/stf.txt b/projmap/data/stf.txt old mode 100755 new mode 100644 diff --git a/projmap/hitta.py b/projmap/hitta.py old mode 100755 new mode 100644 index 03dffcf..4298925 --- a/projmap/hitta.py +++ b/projmap/hitta.py @@ -8,10 +8,10 @@ def projfig(label='',figno=[],lev=0,dpi=100): stack = traceback.extract_stack() parfun = stack[-2][2] namefun = stack[-2][0][:-3] - print parfun, namefun - print "---" - print stack[-2] - print "---" + print(parfun, namefun) + print("---") + print(stack[-2]) + print("---") figno = pl.gcf().number figdir = os.getcwd() + '/figs/' + namefun + "/" + parfun + '/' @@ -20,7 +20,7 @@ def projfig(label='',figno=[],lev=0,dpi=100): except OSError: pass file = '%s/fig_%02i_%s.png' % (figdir, figno, label) - print file + print(file) pl.savefig(file, dpi=dpi) def WRY(): diff --git a/projmap/map_region.py b/projmap/map_region.py old mode 100755 new mode 100644 diff --git a/projmap/map_regions.cfg b/projmap/map_regions.cfg old mode 100755 new mode 100644 diff --git a/setup.py b/setup.py old mode 100755 new mode 100644