diff options
| author | Stuart Bishop <stuart@stuartbishop.net> | 2014-09-01 17:21:46 +0700 |
|---|---|---|
| committer | Stuart Bishop <stuart@stuartbishop.net> | 2014-09-01 17:21:46 +0700 |
| commit | b792df53cd59af2b2fba1b5e6ced26c443b7540c (patch) | |
| tree | bd201a70d71c55ca9589074fa95a142e667f7bd3 | |
| parent | c985dd429ec25d4233f1b26c0dc0517a66253b0c (diff) | |
| download | pytz-b792df53cd59af2b2fba1b5e6ced26c443b7540c.tar.gz | |
Update tests for timezone abbreviation updates
| -rw-r--r-- | src/README.txt | 4 | ||||
| -rw-r--r-- | src/pytz/__init__.py | 4 | ||||
| -rw-r--r-- | src/pytz/tests/test_tzinfo.py | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/README.txt b/src/README.txt index ec99210..05ea8c7 100644 --- a/src/README.txt +++ b/src/README.txt @@ -143,7 +143,7 @@ to use the ``normalize()`` method to ensure the conversion is correct. >>> au_tz = timezone('Australia/Sydney') >>> au_dt = au_tz.normalize(utc_dt.astimezone(au_tz)) >>> au_dt.strftime(fmt) -'2006-03-27 08:34:59 EST+1100' +'2006-03-27 08:34:59 AEDT+1100' >>> utc_dt2 = utc.normalize(au_dt.astimezone(utc)) >>> utc_dt2.strftime(fmt) '2006-03-26 21:34:59 UTC+0000' @@ -159,7 +159,7 @@ deal with. >>> au_tz = timezone('Australia/Sydney') >>> au_dt = au_tz.normalize(utc_dt.astimezone(au_tz)) >>> au_dt.strftime(fmt) -'2006-03-27 08:34:59 EST+1100' +'2006-03-27 08:34:59 AEDT+1100' >>> utc_dt2 = au_dt.astimezone(utc) >>> utc_dt2.strftime(fmt) '2006-03-26 21:34:59 UTC+0000' diff --git a/src/pytz/__init__.py b/src/pytz/__init__.py index 85cef91..e2cced0 100644 --- a/src/pytz/__init__.py +++ b/src/pytz/__init__.py @@ -9,8 +9,8 @@ on how to use these modules. ''' # The Olson database is updated several times a year. -OLSON_VERSION = '2014d' -VERSION = '2014.4' # Switching to pip compatible version numbering. +OLSON_VERSION = '2014g' +VERSION = '2014.7' # Switching to pip compatible version numbering. __version__ = VERSION OLSEN_VERSION = OLSON_VERSION # Old releases had this misspelling diff --git a/src/pytz/tests/test_tzinfo.py b/src/pytz/tests/test_tzinfo.py index 793554d..5a92959 100644 --- a/src/pytz/tests/test_tzinfo.py +++ b/src/pytz/tests/test_tzinfo.py @@ -21,8 +21,8 @@ from pytz.tzinfo import DstTzInfo, StaticTzInfo # I test for expected version to ensure the correct version of pytz is # actually being tested. -EXPECTED_VERSION='2014.4' -EXPECTED_OLSON_VERSION='2014d' +EXPECTED_VERSION='2014.7' +EXPECTED_OLSON_VERSION='2014g' fmt = '%Y-%m-%d %H:%M:%S %Z%z' @@ -547,7 +547,7 @@ class SamoaInternationalDateLineChange(USEasternDSTStartTestCase): tzinfo = pytz.timezone('Pacific/Apia') transition_time = datetime(2011, 12, 30, 10, 0, 0, tzinfo=UTC) before = { - 'tzname': 'WSDT', + 'tzname': 'SDT', 'utcoffset': timedelta(hours=-10), 'dst': timedelta(hours=1), } |