Hello community,
here is the log from the commit of package python-pycountry for
openSUSE:Factory checked in at 2019-08-23 11:03:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pycountry (Old)
and /work/SRC/openSUSE:Factory/.python-pycountry.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pycountry"
Fri Aug 23 11:03:09 2019 rev:5 rq:723944 version:19.7.15
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pycountry/python-pycountry.changes
2019-07-30 13:05:41.810383096 +0200
+++
/work/SRC/openSUSE:Factory/.python-pycountry.new.7948/python-pycountry.changes
2019-08-23 11:03:10.582517527 +0200
@@ -1,0 +2,6 @@
+Fri Aug 16 06:52:52 UTC 2019 - Matthias Fehring <[email protected]>
+
+- add pycountry-19.7.15-fix-reading-description.patch to fix wrong
+ encoding when opening description files in setup.py
+
+-------------------------------------------------------------------
New:
----
pycountry-19.7.15-fix-reading-description.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pycountry.spec ++++++
--- /var/tmp/diff_new_pack.JQi5dL/_old 2019-08-23 11:03:11.270517416 +0200
+++ /var/tmp/diff_new_pack.JQi5dL/_new 2019-08-23 11:03:11.270517416 +0200
@@ -26,6 +26,8 @@
Group: Development/Libraries/Python
URL: https://pypi.python.org/pypi/pycountry/
Source:
https://pypi.io/packages/source/p/%{real_name}/%{real_name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM pycountry-19.7.15-fix-reading-description.patch
[email protected] -- fix wrong enconding
+Patch0: pycountry-19.7.15-fix-reading-description.patch
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
@@ -45,6 +47,7 @@
%prep
%setup -q -n %{real_name}-%{version}
+%patch0 -p1
%build
%python_build
++++++ pycountry-19.7.15-fix-reading-description.patch ++++++
From: Matthias Fehring <[email protected]>
Date: 2019-08-16 08:16:00 +0200
Subject: fix reading description files
Upstream: merged
(https://bitbucket.org/flyingcircus/pycountry/pull-requests/26/read-readme-history-using-utf-8-encoding/diff)
When reading the description in setup.py the wrong encoding will
be selected for the text files.
---
setup.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- a/setup.py 2019-07-15 16:35:49.000000000 +0200
+++ b/setup.py 2019-08-16 08:12:49.493720089 +0200
@@ -3,6 +3,8 @@
# Copyright 2015- (c) Flying Circus Internet Operations GmbH
# See also LICENSE.txt
+from io import open
+
from setuptools import setup, find_packages
@@ -14,8 +16,8 @@
description='ISO country, subdivision, language, currency and script '
'definitions and their translations',
long_description=(
- open('README.rst').read() + '\n' +
- open('HISTORY.txt').read()),
+ open('README.rst', encoding='utf-8').read() + '\n' +
+ open('HISTORY.txt', encoding='utf-8').read()),
license='LGPL 2.1',
keywords='country subdivision language currency iso 3166 639 4217 '
'15924 3166-2',
