Add support for Python 3.6, drop support for Python 3.3.

.travis.yml

@@ -2,12 +2,16 @@ language: python
 sudo: false
 python:
     - 2.7
-    - 3.3
     - 3.4
     - 3.5
+    - 3.6
+    - pypy
+    - pypy3.3-5.2-alpha1
 install:
-    - python bootstrap.py
-    - bin/buildout
+    - pip install -U setuptools
+    - pip install zc.buildout
+    - buildout bootstrap
+    - buildout
 script:
     - bin/test -v1
 notifications:

CHANGES.rst

@@ -4,6 +4,7 @@ Changelog
 4.2 (unreleased)
 ----------------
 
+- Add support for Python 3.6, drop support for Python 3.3.
 
 4.1.1 (2016-04-30)
 ------------------

setup.py

@@ -47,9 +47,9 @@
         "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
     ],

src/DateTime/tests/test_datetime.py

@@ -14,6 +14,7 @@
 
 from datetime import date, datetime, tzinfo, timedelta
 import math
+import platform
 import os
 import sys
 import time
@@ -39,6 +40,8 @@
 else:
     f = __file__
 
+IS_PYPY = getattr(platform, 'python_implementation', lambda: None)() == 'PyPy'
+
 DATADIR = os.path.dirname(os.path.abspath(f))
 del f
 
@@ -576,10 +579,14 @@ def testZoneInFarDates(self):
                          dt2.strftime('%d/%m/%Y %H:%M'))
 
     def testStrftimeUnicode(self):
+        if IS_PYPY:
+            # Using Non-Ascii characters for strftime doesn't work in PyPy
+            # https://bitbucket.org/pypy/pypy/issues/2161/pypy3-strftime-does-not-accept-unicode
+            return
         dt = DateTime('2002-05-02T08:00:00+00:00')
-        uchar = b'\xe0'.decode('latin1')
+        uchar = b'\xc3\xa0'.decode('utf-8')
         ok = dt.strftime('Le %d/%m/%Y a %Hh%M').replace('a', uchar)
-        ustr = b'Le %d/%m/%Y \xe0 %Hh%M'.decode('latin-1')
+        ustr = b'Le %d/%m/%Y \xc3\xa0 %Hh%M'.decode('utf-8')
         self.assertEqual(dt.strftime(ustr), ok)
 
     def testTimezoneNaiveHandling(self):

tox.ini

@@ -1,12 +1,12 @@
 [tox]
 envlist =
-    py27,py33,py34,py35,pypy,coverage
+    py27,py34,py35,py36,pypy,pypy3,coverage
 
 [testenv]
 commands =
-    nosetests
+    zope-testrunner --test-path={envsitepackagesdir} -s DateTime
 deps =
-    nose
+    zope.testrunner
 
 [testenv:coverage]
 basepython =