[med-svn] [python-dendropy] 01/02: Add upstream patch to set encoding in setup script to avoid failures in setup

Andreas Tille tille at debian.org
Tue Jun 23 07:10:40 UTC 2015


This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository python-dendropy.

commit c516d724c39ec04fb41c50bd5352e88afe3a460e
Author: Andreas Tille <tille at debian.org>
Date:   Tue Jun 23 09:08:36 2015 +0200

    Add upstream patch to set encoding in setup script to avoid failures in setup
---
 ...where-encoding-for-default-locale-is-None.patch | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/0001-Fix-bug-where-encoding-for-default-locale-is-None.patch b/debian/patches/0001-Fix-bug-where-encoding-for-default-locale-is-None.patch
new file mode 100644
index 0000000..309b3ec
--- /dev/null
+++ b/debian/patches/0001-Fix-bug-where-encoding-for-default-locale-is-None.patch
@@ -0,0 +1,26 @@
+From c9c1c097f201f2ab2962ac450938c430b3d3dd2f Mon Sep 17 00:00:00 2001
+From: Vachaspati <vachasp2 at taubh1.campuscluster.illinois.edu>
+Date: Fri, 19 Jun 2015 06:03:16 -0500
+Subject: [PATCH] Fix bug where encoding for default locale is None.
+
+---
+ dendropy/utility/textprocessing.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/dendropy/utility/textprocessing.py b/dendropy/utility/textprocessing.py
+index 1227e52..872a4e2 100644
+--- a/dendropy/utility/textprocessing.py
++++ b/dendropy/utility/textprocessing.py
+@@ -32,6 +32,9 @@ import codecs
+ 
+ ENCODING = locale.getdefaultlocale()[1]
+ 
++if ENCODING == None:
++    ENCODING = 'UTF-8'
++
+ def bytes_to_text(s):
+     """
+     Converts a byte string (as read from, e.g., standard input)
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e9b3c95
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-bug-where-encoding-for-default-locale-is-None.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-dendropy.git



More information about the debian-med-commit mailing list