[Python-modules-commits] r26247 - in packages/python-progressbar/trunk/debian (4 files)

[morph at users.alioth.debian.org]

    Date: Tuesday, October 22, 2013 @ 21:40:22
  Author: morph
Revision: 26247

fix Python 3.3 compatibility issues

Added:
  packages/python-progressbar/trunk/debian/patches/
  packages/python-progressbar/trunk/debian/patches/10_python3.3_compat.patch
  packages/python-progressbar/trunk/debian/patches/series
Modified:
  packages/python-progressbar/trunk/debian/changelog

Modified: packages/python-progressbar/trunk/debian/changelog
===================================================================
--- packages/python-progressbar/trunk/debian/changelog	2013-10-22 20:20:43 UTC (rev 26246)
+++ packages/python-progressbar/trunk/debian/changelog	2013-10-22 21:40:22 UTC (rev 26247)
@@ -16,11 +16,13 @@
   * debian/copyright
     - extend packaging copyright years
     - update package homepage
+  * debian/patches/10_python3.3_compat.patch
+    - fix Python 3.3 compatibility issues
 
   [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Sandro Tosi <morph at debian.org>  Sun, 20 Oct 2013 22:20:02 +0200
+ -- Sandro Tosi <morph at debian.org>  Tue, 22 Oct 2013 23:39:15 +0200
 
 python-progressbar (2.2-2) unstable; urgency=low
 

Added: packages/python-progressbar/trunk/debian/patches/10_python3.3_compat.patch
===================================================================
--- packages/python-progressbar/trunk/debian/patches/10_python3.3_compat.patch	                        (rev 0)
+++ packages/python-progressbar/trunk/debian/patches/10_python3.3_compat.patch	2013-10-22 21:40:22 UTC (rev 26247)
@@ -0,0 +1,93 @@
+Description: Remove format as a slot attribute, as that is not compatible with python 3.3
+Author: Nilton Volpato
+Origin: upstream
+Bug: https://code.google.com/p/python-progressbar/issues/detail?id=23
+Applied-Upstream: https://code.google.com/p/python-progressbar/source/detail?spec=svn3c94a3a1ebe1325c7c605cc8f11126dcc632b04d&r=3c94a3a1ebe1325c7c605cc8f11126dcc632b04d
+Last-Update: 2013-10-22
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/progressbar/widgets.py
++++ b/progressbar/widgets.py
+@@ -81,11 +81,11 @@ class WidgetHFill(Widget):
+ class Timer(Widget):
+     'Widget which displays the elapsed seconds.'
+ 
+-    __slots__ = ('format',)
++    __slots__ = ('format_string',)
+     TIME_SENSITIVE = True
+ 
+     def __init__(self, format='Elapsed Time: %s'):
+-        self.format = format
++        self.format_string = format
+ 
+     @staticmethod
+     def format_time(seconds):
+@@ -97,7 +97,7 @@ class Timer(Widget):
+     def update(self, pbar):
+         'Updates the widget to show the elapsed time.'
+ 
+-        return self.format % self.format_time(pbar.seconds_elapsed)
++        return self.format_string % self.format_time(pbar.seconds_elapsed)
+ 
+ 
+ class ETA(Timer):
+@@ -121,9 +121,9 @@ class ETA(Timer):
+ class FileTransferSpeed(Widget):
+     'Widget for showing the transfer speed (useful for file transfers).'
+ 
+-    format = '%6.2f %s%s/s'
+-    prefixes = ' kMGTPEZY'
+-    __slots__ = ('unit', 'format')
++    FORMAT = '%6.2f %s%s/s'
++    PREFIXES = ' kMGTPEZY'
++    __slots__ = ('unit',)
+ 
+     def __init__(self, unit='B'):
+         self.unit = unit
+@@ -138,7 +138,7 @@ class FileTransferSpeed(Widget):
+             power = int(math.log(speed, 1000))
+             scaled = speed / 1000.**power
+ 
+-        return self.format % (scaled, self.prefixes[power], self.unit)
++        return self.FORMAT % (scaled, self.PREFIXES[power], self.unit)
+ 
+ 
+ class AnimatedMarker(Widget):
+@@ -168,13 +168,13 @@ RotatingMarker = AnimatedMarker
+ class Counter(Widget):
+     'Displays the current count'
+ 
+-    __slots__ = ('format',)
++    __slots__ = ('format_string',)
+ 
+     def __init__(self, format='%d'):
+-        self.format = format
++        self.format_string = format
+ 
+     def update(self, pbar):
+-        return self.format % pbar.currval
++        return self.format_string % pbar.currval
+ 
+ 
+ class Percentage(Widget):
+@@ -197,9 +197,9 @@ class FormatLabel(Timer):
+         'value': ('currval', None)
+     }
+ 
+-    __slots__ = ('format',)
++    __slots__ = ('format_string',)
+     def __init__(self, format):
+-        self.format = format
++        self.format_string = format
+ 
+     def update(self, pbar):
+         context = {}
+@@ -213,7 +213,7 @@ class FormatLabel(Timer):
+                    context[name] = transform(value)
+             except: pass
+ 
+-        return self.format % context
++        return self.format_string % context
+ 
+ 
+ class SimpleProgress(Widget):

Added: packages/python-progressbar/trunk/debian/patches/series
===================================================================
--- packages/python-progressbar/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-progressbar/trunk/debian/patches/series	2013-10-22 21:40:22 UTC (rev 26247)
@@ -0,0 +1 @@
+10_python3.3_compat.patch