[Python-modules-commits] r33232 - in packages/pyfiglet/trunk/debian (4 files)

[stefanor at users.alioth.debian.org]

    Date: Saturday, July 4, 2015 @ 05:12:17
  Author: stefanor
Revision: 33232

* Patch py3k: Don't attempt to decode command line args in py3k.
* Update depends for smoketests ADT tests. We now require figlet, as it
  contains our default font.

Added:
  packages/pyfiglet/trunk/debian/patches/py3k.diff
Modified:
  packages/pyfiglet/trunk/debian/changelog
  packages/pyfiglet/trunk/debian/patches/series
  packages/pyfiglet/trunk/debian/tests/control

Modified: packages/pyfiglet/trunk/debian/changelog
===================================================================
--- packages/pyfiglet/trunk/debian/changelog	2015-07-04 04:53:14 UTC (rev 33231)
+++ packages/pyfiglet/trunk/debian/changelog	2015-07-04 05:12:17 UTC (rev 33232)
@@ -1,3 +1,11 @@
+pyfiglet (0.7.4+dfsg-2) UNRELEASED; urgency=medium
+
+  * Patch py3k: Don't attempt to decode command line args in py3k.
+  * Update depends for smoketests ADT tests. We now require figlet, as it
+    contains our default font.
+
+ -- Stefano Rivera <stefanor at debian.org>  Fri, 03 Jul 2015 21:32:38 -0700
+
 pyfiglet (0.7.4+dfsg-1) unstable; urgency=medium
 
   * New upstream release.

Added: packages/pyfiglet/trunk/debian/patches/py3k.diff
===================================================================
--- packages/pyfiglet/trunk/debian/patches/py3k.diff	                        (rev 0)
+++ packages/pyfiglet/trunk/debian/patches/py3k.diff	2015-07-04 05:12:17 UTC (rev 33232)
@@ -0,0 +1,17 @@
+Description: In Python 3, args are already decoded
+Author: Stefano Rivera <stefanor at debian.org>
+Forwarded: https://github.com/pwaller/pyfiglet/pull/45
+Last-Updated: 2015-07-03
+
+--- a/pyfiglet/__init__.py
++++ b/pyfiglet/__init__.py
+@@ -791,7 +791,8 @@
+         parser.print_help()
+         return 1
+ 
+-    args = map(lambda arg: arg.decode(sys.stdout.encoding), args)
++    if sys.version_info < (3,):
++        args = [arg.decode('UTF-8') for arg in args]
+ 
+     text = ' '.join(args)
+ 

Modified: packages/pyfiglet/trunk/debian/patches/series
===================================================================
--- packages/pyfiglet/trunk/debian/patches/series	2015-07-04 04:53:14 UTC (rev 33231)
+++ packages/pyfiglet/trunk/debian/patches/series	2015-07-04 05:12:17 UTC (rev 33232)
@@ -1,3 +1,4 @@
 font-location.diff
 no-entry-points.diff
 bad-toilet-fonts.diff
+py3k.diff

Modified: packages/pyfiglet/trunk/debian/tests/control
===================================================================
--- packages/pyfiglet/trunk/debian/tests/control	2015-07-04 04:53:14 UTC (rev 33231)
+++ packages/pyfiglet/trunk/debian/tests/control	2015-07-04 05:12:17 UTC (rev 33232)
@@ -1,8 +1,8 @@
 Tests: smoketest
-Depends: python-pyfiglet, toilet-fonts
+Depends: figlet, python-pyfiglet, toilet-fonts
 
 Tests: smoketest3
-Depends: python3-pyfiglet, toilet-fonts
+Depends: figlet, python3-pyfiglet, toilet-fonts
 
 Tests: suite
 Depends: python-all, python-pyfiglet, figlet, toilet