[Python-modules-commits] r32156 - in packages/django-countries/trunk/debian/patches (2 files)

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

    Date: Thursday, April 2, 2015 @ 17:15:47
  Author: fladi-guest
Revision: 32156

Drop python3.4-UnicodeDecodeError.patch, fixed upstream.

Modified:
  packages/django-countries/trunk/debian/patches/series
Deleted:
  packages/django-countries/trunk/debian/patches/python3.4-UnicodeDecodeError.patch

Deleted: packages/django-countries/trunk/debian/patches/python3.4-UnicodeDecodeError.patch
===================================================================
--- packages/django-countries/trunk/debian/patches/python3.4-UnicodeDecodeError.patch	2015-04-02 15:51:58 UTC (rev 32155)
+++ packages/django-countries/trunk/debian/patches/python3.4-UnicodeDecodeError.patch	2015-04-02 17:15:47 UTC (rev 32156)
@@ -1,25 +0,0 @@
-Description: Ensure long_description in setup.py uses utf-8 encoding
-Author: Chris Beaven <smileychris at gmail.com>
-Last-Update: 2014-09-01
-Origin: https://github.com/SmileyChris/django-countries/commit/0044975ffc8eb02a1ed67baabc52e1adfc631687
-Bug-Vendor: https://github.com/SmileyChris/django-countries/pull/48
-
-diff --git a/setup.py b/setup.py
-index 81823cf..fe4f3ec 100755
---- a/setup.py
-+++ b/setup.py
-@@ -1,4 +1,5 @@
- #!/usr/bin/env python
-+import io
- import os
- from setuptools import setup, find_packages
- 
-@@ -9,7 +10,7 @@ def long_description():
-     as this module.
-     """
-     base_path = os.path.dirname(os.path.realpath(__file__))
--    readme = open(os.path.join(base_path, 'README.rst'))
-+    readme = io.open(os.path.join(base_path, 'README.rst'), encoding='utf-8')
-     try:
-         return readme.read()
-     finally:

Modified: packages/django-countries/trunk/debian/patches/series
===================================================================
--- packages/django-countries/trunk/debian/patches/series	2015-04-02 15:51:58 UTC (rev 32155)
+++ packages/django-countries/trunk/debian/patches/series	2015-04-02 17:15:47 UTC (rev 32156)
@@ -1,3 +1,2 @@
 dont_include_flag_icons.patch
 use_iso_codes_package.patch
-python3.4-UnicodeDecodeError.patch