[Git][debian-gis-team/pyshp][master] Update setup patch to implement upstream suggestion.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / pyshp


Commits:
776a7fb9 by Bas Couwenberg at 2018-11-05T12:02:02Z
Update setup patch to implement upstream suggestion.

- - - - -


2 changed files:

- debian/changelog
- debian/patches/setup-py2.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+pyshp (2.0.0+ds-1~exp2) UNRELEASED; urgency=medium
+
+  * Update setup patch to implement upstream suggestion.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 05 Nov 2018 13:00:50 +0100
+
 pyshp (2.0.0+ds-1~exp1) experimental; urgency=medium
 
   * Team upload.


=====================================
debian/patches/setup-py2.patch
=====================================
@@ -11,20 +11,15 @@ Forwarded: https://github.com/GeospatialPython/pyshp/pull/171
 
 --- a/setup.py
 +++ b/setup.py
-@@ -1,9 +1,21 @@
-+import codecs
-+import sys
-+
+@@ -1,9 +1,16 @@
  from setuptools import setup
  
-+
-+PYTHON3 = sys.version_info[0] == 3
 +
 +def read_file(file):
-+    if PYTHON3:
-+        return open(file, encoding='utf-8').read()
-+    else:
-+        return codecs.open(file, encoding='utf-8').read()
++    with open(file, 'rb') as fh:
++        data = fh.read()
++
++    return data.decode('utf-8')
 +
  setup(name='pyshp',
        version='2.0.0',



View it on GitLab: https://salsa.debian.org/debian-gis-team/pyshp/commit/776a7fb95150f60d09bbcbef48d8b43a6ea96721

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/pyshp/commit/776a7fb95150f60d09bbcbef48d8b43a6ea96721
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20181105/18ca44a9/attachment-0001.html>