Merge branch 'pr/687'

.travis.yml

@@ -2,6 +2,7 @@ language: python
 python:
     - "2.7"
     - "3.2"
+    - "3.3"
 before_install:
  - sudo apt-get update -qq
  - sudo apt-get install -qq ruby-sass

setup.py

@@ -41,8 +41,10 @@ setup(
          'Environment :: Console',
          'License :: OSI Approved :: GNU Affero General Public License v3',
          'Operating System :: OS Independent',
-         'Programming Language :: Python :: 2.6',
          'Programming Language :: Python :: 2.7',
+         'Programming Language :: Python :: 3',
+         'Programming Language :: Python :: 3.2',
+         'Programming Language :: Python :: 3.3',
          'Topic :: Internet :: WWW/HTTP',
          'Topic :: Software Development :: Libraries :: Python Modules',
     ],

tox.ini

@@ -31,7 +31,7 @@
 
 
 [tox]
-envlist = py27,py32
+envlist = py27,py32,py33
 
 [testenv]
 commands =
@@ -61,3 +61,15 @@ deps =
 #    {distshare}/smartypants-1.6.0.3.zip
 #    {distshare}/typogrify-2.0.0.zip
 #    {distshare}/webassets-0.8.dev.zip
+
+[testenv:py33]
+deps =
+    nose
+    unittest2py3k
+    mock
+    Markdown
+    BeautifulSoup4
+    feedgenerator
+#    {distshare}/smartypants-1.6.0.3.zip
+#    {distshare}/typogrify-2.0.0.zip
+#    {distshare}/webassets-0.8.dev.zip