From 8a7cfe03f12938b2a3b12fa549ef03c043c01b98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Pievil=C3=A4inen?= Date: Sat, 3 Mar 2012 10:08:17 +0200 Subject: README fixes, tz cleanup --- NEWS | 12 ++++++++++++ dateutil/tz.py | 5 ++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 9836d04..f6915f4 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,15 @@ +Version 2.1pre +-------------- + +- New maintainer + +- Dateutil now works on Python 2.6, 2.7 and 3.2 fomr same codebase (with six) + +- https://launchpad.net/bugs/704047: Ismael Carnales' patch for a new time format + +- Small bug fixes, thanks for reporters! + + Version 2.0 ----------- diff --git a/dateutil/tz.py b/dateutil/tz.py index 9df184b..e736d58 100644 --- a/dateutil/tz.py +++ b/dateutil/tz.py @@ -7,7 +7,7 @@ datetime module. __author__ = "Gustavo Niemeyer " __license__ = "Simplified BSD" -from six import string_types +from six import string_types, PY3 import datetime import struct @@ -28,14 +28,13 @@ except (ImportError, OSError): tzwin, tzwinlocal = None, None def tzname_in_python2(myfunc): - import six """Change unicode output into bytestrings in Python 2 tzname() API changed in Python 3. It used to return bytes, but was changed to unicode strings """ def inner_func(*args, **kwargs): - if six.PY3: + if PY3: return myfunc(*args, **kwargs) else: return myfunc(*args, **kwargs).encode() -- cgit v1.2.1