all tests pass for py2.6 and py3.4

.gitignore

@@ -1,43 +1,62 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
 *.py[cod]
+*$py.class
 
 # C extensions
 *.so
 
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
 .installed.cfg
-lib
-lib64
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
 
 # Installer logs
 pip-log.txt
+pip-delete-this-directory.txt
 
 # Unit test / coverage reports
+htmlcov/
+.tox/
 .coverage
-.tox
+.coverage.*
+.cache
 nosetests.xml
-htmlcov
+coverage.xml
+*,cover
+.hypothesis/
 
 # Translations
 *.mo
+*.pot
+
+# Django stuff:
+*.log
 
-# Mr Developer
-.mr.developer.cfg
-.project
-.pydevproject
+# Sphinx documentation
+docs/_build/
 
-# Complexity
-output/*.html
-output/*/index.html
+# PyBuilder
+target/
 
-# Sphinx
-docs/_build
+# vim swap
+*.sw*

.travis.yml

@@ -1,30 +1,32 @@
-# Config file for automatic testing at travis-ci.org
-# This file will be regenerated if you run travis_pypi_setup.py
-
-language: python
-
-env:
-  - TOXENV=py34
-  - TOXENV=py33
-  - TOXENV=py27
-  - TOXENV=py26
-  - TOXENV=pypy
-
-# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
-install: pip install -U tox
-
-# command to run tests, e.g. python setup.py test
-script: tox
-
-# After you create the Github repo and add it to Travis, run the
-# travis_pypi_setup.py script to finish PyPI deployment setup
+# This file was autogenerated and will overwrite each time you run travis_pypi_setup.py
 deploy:
-  provider: pypi
-  distributions: sdist bdist_wheel
   user: lightstrike
+  provider: pypi
   password:
-    secure: PLEASE_REPLACE_ME
-  on:
-    tags: true
-    repo: lightstrike/djeff
+    secure: !!binary |
+      dHU1UGpYYXA5c2QyTjNPTmMwS1h5M25JOUVhdm51aE5aV3FVVjBPVFpSTWpwN2lOOFRjdFY3cnIz
+      aDllbDU1ZEdQQ2F4QzR3TEJSZUwzYXZ0U3J1Tm1mczZGQXd2Zzd6QThoRnpQM0hLd1d4dnl5c3Ri
+      WUlGekhSK2lJOFBxRkRHVWVEQWlCVFcrL2c5Q0ZNWXFNYkNEbkhrVkZrdzE3US9aS2tpdEpSckNV
+      Zm1qNXRpWEJ2dENHc1JQQkJsejFsZjIzRno4ZU1vczM0U0pqMWxBa0wzWVR6cXNvdzNRMDZKd1o4
+      ZWVYT3lTbFE5aGVWNm8vUVRZSEhwM0ZDQ3NBeHJyd3JtaXorRWN2OGJNMklBWVp2SlZaR3UxT2tm
+      ZXQyRk5WQmZ1dmlSVmtFYThNMDdPVWJJbWZ3RkRkSElkZnlnZ1NsMEljNkZlMzZTSUo1WXhjczFk
+      cW9MVlpkaCtqVkZvS1dPblB5c3RQeEtHalk4UTFoNGRzS1VWZ3FWb1ZFdWZ6R3F0UVJXUjJtQ1Jy
+      WmtyV2tKeVR5V0ZFUGU4WkJOWVNOQWgySEc5MVhWQmhuUlBJM2V2SDFCQldmdER4MlhKajRrQmRV
+      di9YK2ZHYXJSTnpsdWFBbkRUUDlsTlNvT1BNZDFtVDAxL3BXcHgzdmZqRVZSdW02cHFFYkQ1Mnpz
+      d1NseFlBbjU2VWtvdHNNZHFNemo1OEF5RkpuTnBma1d1U2tjQnh6SjgxNncwWi9majhkbEdURXR6
+      eVN5TjVKVmxsYWJCU1RZdk9uZk1hRHE5U200UVN3YS9nVXRuT3J4dmFSTE5ZYW9CdWVtZzQ5Y2Q2
+      OStzc0lxVHg3VmU1VDlVRy9DOGJtbk95VUpnSlhBL2pacW9oWlVXSHRuMklyaS9YYW5oTVd2Mk09
+  distributions: sdist bdist_wheel
+  true:
     condition: $TOXENV == py27
+    repo: lightstrike/djeff
+    tags: true
+env:
+- TOXENV=py34
+- TOXENV=py33
+- TOXENV=py27
+- TOXENV=py26
+- TOXENV=pypy
+install: pip install -U tox
+language: python
+script: tox

djeff/djeff.py

@@ -54,7 +54,12 @@ def __init__(self, convert_charrefs=True, *args, **kwargs):
         See:
         https://docs.python.org/3/library/html.parser.html#html.parser.HTMLParser
         """
-        HTMLParser.__init__(self, convert_charrefs=convert_charrefs)
+        # python 3
+        try:
+            HTMLParser.__init__(self, convert_charrefs=convert_charrefs)
+        # python 2
+        except TypeError:
+            HTMLParser.__init__(self)
         self.djhtml = ''
 
     def handle_starttag(self, tag, attrs):

requirements.txt

@@ -0,0 +1 @@
+django==1.8.7

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py33, py34
+envlist = py27, py34
 
 [testenv]
 setenv =
@@ -8,5 +8,5 @@ commands = python setup.py test
 
 ; If you want to make tox run the tests with the same versions, create a
 ; requirements.txt with the pinned versions and uncomment the following lines:
-; deps =
-;     -r{toxinidir}/requirements.txt
+deps =
+    -r{toxinidir}/requirements.txt

travis_pypi_setup.py

@@ -58,7 +58,7 @@ def fetch_public_key(repo):
     Travis API docs: http://docs.travis-ci.com/api/#repository-keys
     """
     keyurl = 'https://api.travis-ci.org/repos/{0}/key'.format(repo)
-    data = json.loads(urlopen(keyurl).read())
+    data = json.loads(urlopen(keyurl).read().decode())
     if 'key' not in data:
         errmsg = "Could not find public key for repo: {}.\n".format(repo)
         errmsg += "Have you already added your GitHub repo to Travis?"
@@ -106,7 +106,8 @@ def update_travis_deploy_password(encrypted_password):
 def main(args):
     public_key = fetch_public_key(args.repo)
     password = args.password or getpass('PyPI password: ')
-    update_travis_deploy_password(encrypt(public_key, password))
+    update_travis_deploy_password(
+        encrypt(public_key, bytes(password.encode('utf-8'))))
     print("Wrote encrypted password to .travis.yml -- you're ready to deploy")