[pyshp] 03/07: Imported Upstream version 1.2.3+ds

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository pyshp.

commit 39661de8ec9cd6124ccb66cdaecdc0769a4fbd5f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jun 26 23:15:31 2015 +0200

    Imported Upstream version 1.2.3+ds
---
 PKG-INFO     |  6 +++---
 README.txt   |  2 +-
 setup.py     |  4 ++--
 shapefile.py | 13 ++++++++-----
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/PKG-INFO b/PKG-INFO
index 60e889b..ed0b3f7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: pyshp
-Version: 1.2.2
+Version: 1.2.3
 Summary: Pure Python read/write support for ESRI Shapefile format
 Home-page: https://github.com/GeospatialPython/pyshp
 Author: Joel Lawhead
 Author-email: jlawhead at geospatialpython.com
 License: MIT
-Download-URL: https://github.com/GeospatialPython/pyshp/archive/1.2.2.tar.gz
+Download-URL: https://github.com/GeospatialPython/pyshp/archive/1.2.3.tar.gz
 Description: PyShp
         ========================
         
@@ -662,7 +662,7 @@ Description: PyShp
         among geospatial Python libraries.  The interface returns data as GeoJSON.
         More information on the __geo_interface__ protocol can be found at:
         https://gist.github.com/sgillies/2217756.
-        More information on GeoJSON is available at http://geojson.org http://geojson.org.
+        More information on GeoJSON is available at http://geojson.org.
          
         >>> s = sf.shape(0)
         >>> s.__geo_interface__["type"]
diff --git a/README.txt b/README.txt
index 8e09eec..df8014f 100644
--- a/README.txt
+++ b/README.txt
@@ -653,7 +653,7 @@ The Python __geo_interface__ convention provides a data interchange interface
 among geospatial Python libraries.  The interface returns data as GeoJSON.
 More information on the __geo_interface__ protocol can be found at:
 https://gist.github.com/sgillies/2217756.
-More information on GeoJSON is available at http://geojson.org http://geojson.org.
+More information on GeoJSON is available at http://geojson.org.
  
 >>> s = sf.shape(0)
 >>> s.__geo_interface__["type"]
diff --git a/setup.py b/setup.py
index f2a08ab..a5a0b8c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,13 +1,13 @@
 from setuptools import setup
 
 setup(name='pyshp',
-      version='1.2.2',
+      version='1.2.3',
       description='Pure Python read/write support for ESRI Shapefile format',
       long_description=open('README.txt').read(),
       author='Joel Lawhead',
       author_email='jlawhead at geospatialpython.com',
       url='https://github.com/GeospatialPython/pyshp',
-      download_url='https://github.com/GeospatialPython/pyshp/archive/1.2.2.tar.gz',
+      download_url='https://github.com/GeospatialPython/pyshp/archive/1.2.3.tar.gz',
       py_modules=['shapefile'],
       license='MIT',
       zip_safe=False,
diff --git a/shapefile.py b/shapefile.py
index c844ceb..c125a90 100644
--- a/shapefile.py
+++ b/shapefile.py
@@ -2,13 +2,13 @@
 shapefile.py
 Provides read and write support for ESRI Shapefiles.
 author: jlawhead<at>geospatialpython.com
-date: 2015/01/09
-version: 1.2.2
+date: 2015/06/22
+version: 1.2.3
 Compatible with Python versions 2.4-3.x
-version changelog: Added `Reader.iterShapeRecords` to help work with larger files
+version changelog: Reader.iterShapeRecords() bugfix for Python 3
 """
 
-__version__ = "1.2.2"
+__version__ = "1.2.3"
 
 from struct import pack, unpack, calcsize, error
 import os
@@ -39,6 +39,9 @@ PYTHON3 = sys.version_info[0] == 3
 
 if PYTHON3:
     xrange = range
+    izip = zip
+else:
+    from itertools import izip
 
 def b(v):
     if PYTHON3:
@@ -571,7 +574,7 @@ class Reader:
     def iterShapeRecords(self):
         """Returns a generator of combination geometry/attribute records for
         all records in a shapefile."""
-        for shape, record in itertools.izip(self.iterShapes(), self.iterRecords()):
+        for shape, record in izip(self.iterShapes(), self.iterRecords()):
             yield _ShapeRecord(shape=shape, record=record)
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pyshp.git