Patch for string handling in tzstr

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-03-03 15:16:00 -05:00
parent 386a76f424
commit c9ff591a7f
2 changed files with 19 additions and 3 deletions

View File

@ -0,0 +1,13 @@
diff --git dateutil/parser.py~ dateutil/parser.py
index 8b6c2d28b8..75453ef49e 100644
--- dateutil/parser.py~
+++ dateutil/parser.py
@@ -32,7 +32,7 @@ __all__ = ["parse", "parserinfo"]
class _timelex(object):
def __init__(self, instream):
- if isinstance(instream, text_type):
+ if not hasattr(instream, 'read'):
instream = StringIO(instream)
self.instream = instream
self.wordchars = ('abcdfeghijklmnopqrstuvwxyz'

View File

@ -1,6 +1,6 @@
Name: python-dateutil Name: python-dateutil
Version: 2.4.0 Version: 2.4.0
Release: 2%{?dist} Release: 3%{?dist}
Epoch: 1 Epoch: 1
Summary: Powerful extensions to the standard datetime module Summary: Powerful extensions to the standard datetime module
@ -10,6 +10,7 @@ URL: https://github.com/dateutil/dateutil
Source0: https://github.com/dateutil/dateutil/archive/2.4.0.tar.gz Source0: https://github.com/dateutil/dateutil/archive/2.4.0.tar.gz
# https://github.com/dateutil/dateutil/issues/11 # https://github.com/dateutil/dateutil/issues/11
Patch0: python-dateutil-system-zoneinfo.patch Patch0: python-dateutil-system-zoneinfo.patch
Patch1: python-dateutil-timelex-string.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: python2-devel BuildRequires: python2-devel
@ -48,8 +49,7 @@ Summary: API documentation for python-dateutil
This package contains %{summary}. This package contains %{summary}.
%prep %prep
%setup -q -n dateutil-%{version} %autosetup -p0 -n dateutil-%{version}
%patch0 -p0
iconv --from=ISO-8859-1 --to=UTF-8 NEWS > NEWS.new iconv --from=ISO-8859-1 --to=UTF-8 NEWS > NEWS.new
mv NEWS.new NEWS mv NEWS.new NEWS
@ -83,6 +83,9 @@ make -C docs html
%doc docs/_build/html %doc docs/_build/html
%changelog %changelog
* Tue Mar 3 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:2.4.0-3
- Add patch for string handling in dateutil.tz.tzstr (#1197791)
* Wed Jan 21 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:2.4.0-2 * Wed Jan 21 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:2.4.0-2
- Add python3 subpackage. - Add python3 subpackage.
- Conflict with python-vobject <= 0.8.1c-10 (workaround until #1183377 - Conflict with python-vobject <= 0.8.1c-10 (workaround until #1183377