summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Suster <carl@contraflo.ws>2017-01-11 23:13:59 +1100
committerCarl Suster <carl@contraflo.ws>2017-01-11 23:13:59 +1100
commitf5b7b40591e466351412987ed4ad0b90167f8547 (patch)
tree1bb0530fffcc3e398a43b0df1ee4dc781b58be5f
parent192a9f99772f22157d4fa1734363ff07ac5fd863 (diff)
parent591e67b26a2d694d5aae2d77985eab4d8daf2d9e (diff)
merge patched into master
-rw-r--r--debian/.git-dpm4
-rw-r--r--debian/patches/0003-give-lxml-etree-BytesIO-in-Python-3.patch6
-rw-r--r--pynzb/lxml_nzb.py2
3 files changed, 6 insertions, 6 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 3b2ef42..f93cbbb 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
# see git-dpm(1) from git-dpm package
-351c51b882bf00d1db03de5a2419372e2e31d6cf
-351c51b882bf00d1db03de5a2419372e2e31d6cf
+591e67b26a2d694d5aae2d77985eab4d8daf2d9e
+591e67b26a2d694d5aae2d77985eab4d8daf2d9e
124074ce42e5d83c71e028a8757afb392cc96548
124074ce42e5d83c71e028a8757afb392cc96548
python-pynzb_0.1.0.orig.tar.gz
diff --git a/debian/patches/0003-give-lxml-etree-BytesIO-in-Python-3.patch b/debian/patches/0003-give-lxml-etree-BytesIO-in-Python-3.patch
index 32746fd..aac136f 100644
--- a/debian/patches/0003-give-lxml-etree-BytesIO-in-Python-3.patch
+++ b/debian/patches/0003-give-lxml-etree-BytesIO-in-Python-3.patch
@@ -1,4 +1,4 @@
-From 351c51b882bf00d1db03de5a2419372e2e31d6cf Mon Sep 17 00:00:00 2001
+From 591e67b26a2d694d5aae2d77985eab4d8daf2d9e Mon Sep 17 00:00:00 2001
From: Carl Suster <carl@contraflo.ws>
Date: Wed, 11 Jan 2017 22:34:34 +1100
Subject: give lxml etree BytesIO in Python 3
@@ -11,7 +11,7 @@ switches to BytesIO in Python 3, decoding the XML data as UTF-8.
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/pynzb/lxml_nzb.py b/pynzb/lxml_nzb.py
-index 790671d..9d76c4a 100644
+index 790671d..e74ba34 100644
--- a/pynzb/lxml_nzb.py
+++ b/pynzb/lxml_nzb.py
@@ -6,11 +6,17 @@ except ImportError:
@@ -30,7 +30,7 @@ index 790671d..9d76c4a 100644
+ from StringIO import StringIO
+ def as_io(xml): return StringIO(xml)
+else:
-+ from BytesIO import BytesIO
++ from io import BytesIO
+ def as_io(xml): return BytesIO(bytes(xml, 'utf-8'))
class LXMLNZBParser(BaseETreeNZBParser):
diff --git a/pynzb/lxml_nzb.py b/pynzb/lxml_nzb.py
index 9d76c4a..e74ba34 100644
--- a/pynzb/lxml_nzb.py
+++ b/pynzb/lxml_nzb.py
@@ -14,7 +14,7 @@ if sys.version_info.major < 3:
from StringIO import StringIO
def as_io(xml): return StringIO(xml)
else:
- from BytesIO import BytesIO
+ from io import BytesIO
def as_io(xml): return BytesIO(bytes(xml, 'utf-8'))
class LXMLNZBParser(BaseETreeNZBParser):