Browse Source

Re-revert to not using pytz

Will spin a tzinfo subclass.
pull/2374/head
Eugene M. Kim 7 years ago
parent
commit
f803760275
  1. 21
      tests/test_helpers.py
  2. 1
      tox.ini

21
tests/test_helpers.py

@ -23,12 +23,6 @@ from werkzeug.http import parse_cache_control_header, parse_options_header
from werkzeug.http import http_date from werkzeug.http import http_date
from flask._compat import StringIO, text_type from flask._compat import StringIO, text_type
from flask.helpers import get_debug_flag, make_response from flask.helpers import get_debug_flag, make_response
try:
from pytz import timezone
except ImportError:
has_pytz = False
else:
has_pytz = True
def has_encoding(name): def has_encoding(name):
@ -183,15 +177,14 @@ class TestJSON(object):
assert rv.mimetype == 'application/json' assert rv.mimetype == 'application/json'
assert flask.json.loads(rv.data)['x'] == http_date(d.timetuple()) assert flask.json.loads(rv.data)['x'] == http_date(d.timetuple())
@pytest.mark.skipif('not has_pytz') @pytest.mark.parametrize('tz', (('UTC', 0), ('PST', -8), ('KST', 9)))
@pytest.mark.parametrize('tzname', ('UTC', 'PST8PDT', 'Asia/Seoul')) def test_jsonify_aware_datetimes(self, tz):
def test_jsonify_aware_datetimes(self, tzname):
"""Test if aware datetime.datetime objects are converted into GMT.""" """Test if aware datetime.datetime objects are converted into GMT."""
dt_naive = datetime.datetime(2017, 1, 1, 12, 34, 56) tzinfo = datetime.timezone(datetime.timedelta(hours=tz[1]), name=tz[0])
dt_aware = timezone(tzname).localize(dt_naive) dt = datetime.datetime(2017, 1, 1, 12, 34, 56, tzinfo=tzinfo)
dt_as_gmt = dt_aware.astimezone(timezone('GMT')) gmt = datetime.timezone(datetime.timedelta(), name='GMT')
expected = dt_as_gmt.strftime('"%a, %d %b %Y %H:%M:%S %Z"') expected = dt.astimezone(gmt).strftime('"%a, %d %b %Y %H:%M:%S %Z"')
assert flask.json.JSONEncoder().encode(dt_aware) == expected assert flask.json.JSONEncoder().encode(dt) == expected
def test_jsonify_uuid_types(self, app, client): def test_jsonify_uuid_types(self, app, client):
"""Test jsonify with uuid.UUID types""" """Test jsonify with uuid.UUID types"""

1
tox.ini

@ -15,7 +15,6 @@ deps =
coverage coverage
greenlet greenlet
blinker blinker
pytz
lowest: Werkzeug==0.9 lowest: Werkzeug==0.9
lowest: Jinja2==2.4 lowest: Jinja2==2.4

Loading…
Cancel
Save