Fix LP: #1482844 properly: lp1432889.patch is incompatible with...

Fix LP: #1482844 properly: lp1432889.patch is incompatible with fix-auth-lp1482844.patch (Closes: #796889).
parent 2ec6f1d3
...@@ -81,8 +81,7 @@ class Xauthority: ...@@ -81,8 +81,7 @@ class Xauthority:
if len(data) != length: if len(data) != length:
break break
self.entries.append((family, addr.decode('UTF-8'), self.entries.append((family, addr, num, name, data))
num.decode('UTF-8'), name.decode('UTF-8'), data))
except struct.error as e: except struct.error as e:
print ("Xlib.xauth: warning, failed to parse part of xauthority file (%s), aborting all further parsing" % filename) print ("Xlib.xauth: warning, failed to parse part of xauthority file (%s), aborting all further parsing" % filename)
#pass #pass
......
python-xlib (0.14+20091101-5) unstable; urgency=medium
* Fix LP: #1482844 properly: lp1432889.patch is incompatible with
fix-auth-lp1482844.patch (Closes: #796889).
-- Andrew Shadura <andrewsh@debian.org> Tue, 25 Aug 2015 16:18:06 +0200
python-xlib (0.14+20091101-4) unstable; urgency=medium python-xlib (0.14+20091101-4) unstable; urgency=medium
* Do proper string-bytes conversion (LP: #1482844). * Do proper string-bytes conversion (LP: #1482844).
......
Description: properly decode the xauthority file into strings instead of
byte arrays in Xlib/xauth.py
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-xlib/+bug/1432889
Author: Marc Deslauriers <marc.deslauriers@canonical.com>
Index: python-xlib-0.14+20091101/Xlib/xauth.py
===================================================================
--- python-xlib-0.14+20091101.orig/Xlib/xauth.py 2015-03-17 11:15:24.108766995 -0400
+++ python-xlib-0.14+20091101/Xlib/xauth.py 2015-03-17 11:16:20.333272353 -0400
@@ -81,7 +81,8 @@
if len(data) != length:
break
- self.entries.append((family, addr, num, name, data))
+ self.entries.append((family, addr.decode('UTF-8'),
+ num.decode('UTF-8'), name.decode('UTF-8'), data))
except struct.error as e:
print ("Xlib.xauth: warning, failed to parse part of xauthority file (%s), aborting all further parsing" % filename)
#pass
...@@ -4,7 +4,6 @@ add-texinfo-dir-entry.patch ...@@ -4,7 +4,6 @@ add-texinfo-dir-entry.patch
fix-ssh-tunnel-auth.patch fix-ssh-tunnel-auth.patch
fix-rhomboid-examples.patch fix-rhomboid-examples.patch
python3.patch python3.patch
lp1432889.patch
remove-debugging-output.patch remove-debugging-output.patch
texi2html.patch texi2html.patch
fix-auth-lp1482844.patch fix-auth-lp1482844.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment