diff options
| author | Carl Suster <carl@contraflo.ws> | 2017-01-11 23:02:41 +1100 |
|---|---|---|
| committer | Carl Suster <carl@contraflo.ws> | 2017-01-11 23:02:41 +1100 |
| commit | 192a9f99772f22157d4fa1734363ff07ac5fd863 (patch) | |
| tree | 80504280e5bfc697159fda59449d35ff4e7714cb | |
| parent | 54650b570eb48237c9e96165261779abf254a566 (diff) | |
| parent | 351c51b882bf00d1db03de5a2419372e2e31d6cf (diff) | |
merge patched into master
| -rw-r--r-- | debian/.git-dpm | 4 | ||||
| -rw-r--r-- | debian/patches/0003-give-lxml-etree-BytesIO-in-Python-3.patch | 10 | ||||
| -rw-r--r-- | pynzb/lxml_nzb.py | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm index e8ed9aa..3b2ef42 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -5bb9aae805947e77215ff8c433d52a987dbf75a0 -5bb9aae805947e77215ff8c433d52a987dbf75a0 +351c51b882bf00d1db03de5a2419372e2e31d6cf +351c51b882bf00d1db03de5a2419372e2e31d6cf 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 0f86fce..32746fd 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 5bb9aae805947e77215ff8c433d52a987dbf75a0 Mon Sep 17 00:00:00 2001 +From 351c51b882bf00d1db03de5a2419372e2e31d6cf 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..b1d0dc6 100644 +index 790671d..9d76c4a 100644 --- a/pynzb/lxml_nzb.py +++ b/pynzb/lxml_nzb.py @@ -6,11 +6,17 @@ except ImportError: @@ -28,13 +28,13 @@ index 790671d..b1d0dc6 100644 + from cStringIO import StringIO + except ImportError: + from StringIO import StringIO -+ def io(xml): return StringIO(xml) ++ def as_io(xml): return StringIO(xml) +else: + from BytesIO import BytesIO -+ def io(xml): return BytesIO(bytes(xml, 'utf-8')) ++ def as_io(xml): return BytesIO(bytes(xml, 'utf-8')) class LXMLNZBParser(BaseETreeNZBParser): def get_etree_iter(self, xml, et=etree): - return iter(et.iterparse(StringIO(xml), events=("start", "end"))) \ No newline at end of file -+ return iter(et.iterparse(io(xml), events=("start", "end"))) ++ return iter(et.iterparse(as_io(xml), events=("start", "end"))) diff --git a/pynzb/lxml_nzb.py b/pynzb/lxml_nzb.py index b1d0dc6..9d76c4a 100644 --- a/pynzb/lxml_nzb.py +++ b/pynzb/lxml_nzb.py @@ -12,11 +12,11 @@ if sys.version_info.major < 3: from cStringIO import StringIO except ImportError: from StringIO import StringIO - def io(xml): return StringIO(xml) + def as_io(xml): return StringIO(xml) else: from BytesIO import BytesIO - def io(xml): return BytesIO(bytes(xml, 'utf-8')) + def as_io(xml): return BytesIO(bytes(xml, 'utf-8')) class LXMLNZBParser(BaseETreeNZBParser): def get_etree_iter(self, xml, et=etree): - return iter(et.iterparse(io(xml), events=("start", "end"))) + return iter(et.iterparse(as_io(xml), events=("start", "end"))) |