[Python-modules-commits] r21869 - in packages/pywavelets/trunk/debian (3 files)

[eriol-guest at users.alioth.debian.org]

    Date: Tuesday, May 22, 2012 @ 04:49:59
  Author: eriol-guest
Revision: 21869

Added upstream patch to fix python interactive built-in help system

Added:
  packages/pywavelets/trunk/debian/patches/03_fix-help.patch
Modified:
  packages/pywavelets/trunk/debian/changelog
  packages/pywavelets/trunk/debian/patches/series

Modified: packages/pywavelets/trunk/debian/changelog
===================================================================
--- packages/pywavelets/trunk/debian/changelog	2012-05-22 04:17:55 UTC (rev 21868)
+++ packages/pywavelets/trunk/debian/changelog	2012-05-22 04:49:59 UTC (rev 21869)
@@ -3,8 +3,11 @@
   * debian/patches/02_skip-wavelet-filters-coefficients-doctest.patches
     - Removed because exceed by 02_format-float-array-in-doctests.patch
   * debian/patches/02_format-float-array-in-doctests.patch
-    - Added upstream patch to fix representation float issues in doctests
-      accross Python versions
+    - Added upstream patch to fix representation float issues in
+      doctests accross Python versions
+  * debian/patches/03_fix-help.patch
+    - Added upstream patch to fix python interactive built-in help
+      system (Closes: #595980)
 
  -- Daniele Tricoli <eriol at mornie.org>  Tue, 22 May 2012 05:35:15 +0200
 

Added: packages/pywavelets/trunk/debian/patches/03_fix-help.patch
===================================================================
--- packages/pywavelets/trunk/debian/patches/03_fix-help.patch	                        (rev 0)
+++ packages/pywavelets/trunk/debian/patches/03_fix-help.patch	2012-05-22 04:49:59 UTC (rev 21869)
@@ -0,0 +1,40 @@
+Origin: upstream, https://bitbucket.org/nigma/pywt/changeset/4ff3f22025c9
+Description: Replaced MustOverride hack for BaseNode attributes with plain old
+ comment.
+Bug: https://bitbucket.org/nigma/pywt/issue/2/help-broken
+Bug-Debian: http://bugs.debian.org/595980
+Last-Update: 2012-05-22
+
+--- a/pywt/wavelet_packets.py
++++ b/pywt/wavelet_packets.py
+@@ -22,14 +22,15 @@
+     return graycode_order
+
+
+-class MustOverride(object):
+-    def __init__(self, message): self.message= message
+-    def __get__(self, obj, cls): raise NotImplementedError(self.message % {'cls': cls.__name__})
+-
+-
+ class BaseNode(object):
+-    PART_LEN = MustOverride("BaseNode.PART_LEN must be redefined in subclass %(cls)s.")
+-    PARTS = MustOverride("BaseNode.PARTS must be redefined in subclass %(cls)s.")
++    """
++    BaseNode for wavelet packet 1D and 2D tree nodes.
++    """
++
++    # PART_LEN and PARTS attributes that define path tokens for
++    # node[] lookup must be defined in subclasses.
++    PART_LEN = None
++    PARTS = None
+
+     def __init__(self, parent, data, node_name):
+         self.parent = parent
+@@ -341,6 +342,7 @@
+ class Node2D(BaseNode):
+     """
+     WaveletPacket tree node.
++
+     Subnodes are called 'a' (LL), 'h' (LH), 'v' (HL) and  'd' (HH), like approximation and
+     detail coefficients in 2D Discrete Wavelet Transform
+     """

Modified: packages/pywavelets/trunk/debian/patches/series
===================================================================
--- packages/pywavelets/trunk/debian/patches/series	2012-05-22 04:17:55 UTC (rev 21868)
+++ packages/pywavelets/trunk/debian/patches/series	2012-05-22 04:49:59 UTC (rev 21869)
@@ -1,3 +1,3 @@
 01_fix-cython-0-14-compiling.patch
 02_format-float-array-in-doctests.patch
-
+03_fix-help.patch