Fix tests

Author: sdispater

tests/tz/test_timezone.py

@@ -3,14 +3,14 @@
 
 import pendulum
 from pendulum import timezone
-from pendulum.utils._compat import PY2
+from pendulum.utils._compat import PY36
 from pendulum.tz import fixed_timezone
 from pendulum.tz.exceptions import NonExistingTime, AmbiguousTime
 
 from ..conftest import assert_datetime
 
 
-@pytest.mark.skipif(PY2, reason='fold attribute only present in Python 3.6+')
+@pytest.mark.skipif(not PY36, reason='fold attribute only present in Python 3.6+')
 def test_basic_convert():
     dt = datetime(2016, 6, 1, 12, 34, 56, 123456, fold=1)
     tz = timezone('Europe/Paris')
@@ -28,7 +28,7 @@ def test_basic_convert():
     assert dt.tzinfo.dst(dt) == timedelta(seconds=3600)
 
 
-@pytest.mark.skipif(PY2, reason='fold attribute only present in Python 3.6+')
+@pytest.mark.skipif(not PY36, reason='fold attribute only present in Python 3.6+')
 def test_skipped_time_with_pre_rule():
     dt = datetime(2013, 3, 31, 2, 30, 45, 123456, fold=0)
     tz = timezone('Europe/Paris')
@@ -46,7 +46,7 @@ def test_skipped_time_with_pre_rule():
     assert dt.tzinfo.dst(dt) == timedelta()
 
 
-@pytest.mark.skipif(PY2, reason='fold attribute only present in Python 3.6+')
+@pytest.mark.skipif(not PY36, reason='fold attribute only present in Python 3.6+')
 def test_skipped_time_with_post_rule():
     dt = datetime(2013, 3, 31, 2, 30, 45, 123456, fold=1)
     tz = timezone('Europe/Paris')
@@ -105,7 +105,7 @@ def test_skipped_time_with_error():
         tz.convert(dt, dst_rule=pendulum.TRANSITION_ERROR)
 
 
-@pytest.mark.skipif(PY2, reason='fold attribute only present in Python 3.6+')
+@pytest.mark.skipif(not PY36, reason='fold attribute only present in Python 3.6+')
 def test_repeated_time():
     dt = datetime(2013, 10, 27, 2, 30, 45, 123456, fold=1)
     tz = timezone('Europe/Paris')
@@ -123,7 +123,7 @@ def test_repeated_time():
     assert dt.tzinfo.dst(dt) == timedelta()
 
 
-@pytest.mark.skipif(PY2, reason='fold attribute only present in Python 3.6+')
+@pytest.mark.skipif(not PY36, reason='fold attribute only present in Python 3.6+')
 def test_repeated_time_explicit_post_rule():
     dt = datetime(2013, 10, 27, 2, 30, 45, 123456)
     tz = timezone('Europe/Paris')
@@ -141,7 +141,7 @@ def test_repeated_time_explicit_post_rule():
     assert dt.tzinfo.dst(dt) == timedelta()
 
 
-@pytest.mark.skipif(PY2, reason='fold attribute only present in Python 3.6+')
+@pytest.mark.skipif(not PY36, reason='fold attribute only present in Python 3.6+')
 def test_repeated_time_pre_rule():
     dt = datetime(2013, 10, 27, 2, 30, 45, 123456, fold=0)
     tz = timezone('Europe/Paris')
@@ -159,7 +159,7 @@ def test_repeated_time_pre_rule():
     assert dt.tzinfo.dst(dt) == timedelta(seconds=3600)
 
 
-@pytest.mark.skipif(PY2, reason='Disambiguation is not available in Python 2.7')
+@pytest.mark.skipif(not PY36, reason='Disambiguation is not available in Python 2.7')
 def test_repeated_time_explicit_pre_rule():
     dt = datetime(2013, 10, 27, 2, 30, 45, 123456)
     tz = timezone('Europe/Paris')
@@ -335,7 +335,7 @@ def test_on_last_transition():
     assert dt.utcoffset().total_seconds() == 7200
 
 
-@pytest.mark.skipif(PY2, reason='fold attribute only present in Python 3.6+')
+@pytest.mark.skipif(not PY36, reason='fold attribute only present in Python 3.6+')
 def test_convert_fold_attribute_is_honored():
     tz = pendulum.timezone('US/Eastern')
     dt = datetime(2014, 11, 2, 1, 30)
@@ -347,7 +347,7 @@ def test_convert_fold_attribute_is_honored():
     assert new.strftime('%z') == '-0500'
 
 
-@pytest.mark.skipif(PY2, reason='fold attribute only present in Python 3.6+')
+@pytest.mark.skipif(not PY36, reason='fold attribute only present in Python 3.6+')
 def test_utcoffset_fold_attribute_is_honored():
     tz = pendulum.timezone('US/Eastern')
     dt = datetime(2014, 11, 2, 1, 30)
@@ -361,7 +361,7 @@ def test_utcoffset_fold_attribute_is_honored():
     assert offset.total_seconds() == -5 * 3600
 
 
-@pytest.mark.skipif(PY2, reason='fold attribute only present in Python 3.6+')
+@pytest.mark.skipif(not PY36, reason='fold attribute only present in Python 3.6+')
 def test_dst_fold_attribute_is_honored():
     tz = pendulum.timezone('US/Eastern')
     dt = datetime(2014, 11, 2, 1, 30)
@@ -375,7 +375,7 @@ def test_dst_fold_attribute_is_honored():
     assert offset.total_seconds() == 0
 
 
-@pytest.mark.skipif(PY2, reason='fold attribute only present in Python 3.6+')
+@pytest.mark.skipif(not PY36, reason='fold attribute only present in Python 3.6+')
 def test_tzname_fold_attribute_is_honored():
     tz = pendulum.timezone('US/Eastern')
     dt = datetime(2014, 11, 2, 1, 30)
@@ -389,7 +389,7 @@ def test_tzname_fold_attribute_is_honored():
     assert name == 'EST'
 
 
-@pytest.mark.skipif(PY2, reason='fold attribute only present in Python 3.6+')
+@pytest.mark.skipif(not PY36, reason='fold attribute only present in Python 3.6+')
 def test_constructor_fold_attribute_is_honored():
     tz = pendulum.timezone('US/Eastern')
     dt = datetime(2014, 11, 2, 1, 30, tzinfo=tz)
@@ -401,7 +401,7 @@ def test_constructor_fold_attribute_is_honored():
     assert dt.strftime('%z') == '-0500'
 
 
-@pytest.mark.skipif(PY2, reason='fold attribute only present in Python 3.6+')
+@pytest.mark.skipif(not PY36, reason='fold attribute only present in Python 3.6+')
 def test_convert_sets_fold_attribute_properly():
     tz = pendulum.timezone('US/Eastern')