[Python-modules-commits] r2128 - in /packages/python-dsv/trunk/debian: changelog patches/03-avoid-unicoditis.patch

[ucko at users.alioth.debian.org]

Author: ucko
Date: Fri Apr 20 18:32:41 2007
New Revision: 2128

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2128
Log:
debian/patches/03-avoid-unicoditis.patch (new): Try to convert Unicode
delimiters back to ASCII (wxPython can be overenthusiastic), but
ultimately support either.

Added:
    packages/python-dsv/trunk/debian/patches/03-avoid-unicoditis.patch
Modified:
    packages/python-dsv/trunk/debian/changelog

Modified: packages/python-dsv/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-dsv/trunk/debian/changelog?rev=2128&op=diff
==============================================================================
--- packages/python-dsv/trunk/debian/changelog (original)
+++ packages/python-dsv/trunk/debian/changelog Fri Apr 20 18:32:41 2007
@@ -9,8 +9,11 @@
   * debian/patches/02-wx-namespace-transition.patch (new, via Joe Pham
     <djpham at bitpim.org>): use the modern wx package rather than the
     clunkier wxPython package, which wxWidgets 2.8 will no longer provide.
+  * debian/patches/03-avoid-unicoditis.patch (new): Try to convert Unicode
+    delimiters back to ASCII (wxPython can be overenthusiastic), but
+    ultimately support either.
 
- -- Aaron M. Ucko <ucko at debian.org>  Wed,  7 Mar 2007 13:38:40 -0500
+ -- Aaron M. Ucko <ucko at debian.org>  Fri, 20 Apr 2007 14:32:08 -0400
 
 python-dsv (1.4.0-4) unstable; urgency=low
 

Added: packages/python-dsv/trunk/debian/patches/03-avoid-unicoditis.patch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-dsv/trunk/debian/patches/03-avoid-unicoditis.patch?rev=2128&op=file
==============================================================================
--- packages/python-dsv/trunk/debian/patches/03-avoid-unicoditis.patch (added)
+++ packages/python-dsv/trunk/debian/patches/03-avoid-unicoditis.patch Fri Apr 20 18:32:41 2007
@@ -1,0 +1,20 @@
+diff -Nur python-dsv-1.4.0/DSV/DSV.py python-dsv-1.4.0.new/DSV/DSV.py
+--- python-dsv-1.4.0/DSV/DSV.py	2007-03-06 19:54:13.000000000 -0500
++++ python-dsv-1.4.0.new/DSV/DSV.py	2007-04-19 17:55:20.514048095 -0400
+@@ -471,8 +471,14 @@
+       list of lists of data
+     """
+     if type(input) != type([]):
+-        raise InvalidData, "expected list of lists of strings"  
+-    if type(delimiter) != type('') or not delimiter:
++        raise InvalidData, "expected list of lists of strings"
++    # Try to convert Unicode delimiters back to ASCII (wxPython can be
++    # overenthusiastic), but ultimately support either.
++    try:
++        delimiter = delimiter.encode()
++    except:
++        pass
++    if (type(delimiter) != str and type(delimiter) != unicode) or not delimiter:
+         raise InvalidDelimiter, `delimiter`
+ 
+ ##    if textQualifier: