Merge 061aae5d13 into 0b3dc9db21

.travis.yml

@@ -10,7 +10,7 @@ install:
     - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then ln -s /usr/share/asciidoc/asciidocapi.py ~/virtualenv/python2.7/lib/python2.7/site-packages/; fi
     - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install typogrify ; fi
     - if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then pip install git+https://github.com/dmdm/typogrify.git@py3k#egg=typogrify; fi
-    - pip install mock nose nose-cov Markdown
+    - pip install mock nose nose-cov Markdown six
     - pip install .
 script: nosetests -sv --with-coverage --cover-package=pelican pelican
 after_success:

dev_requirements.txt

@@ -6,6 +6,7 @@ Markdown
 BeautifulSoup4
 lxml
 typogrify
+six
 
 # To perform release
 bumpr==0.2.0

tox.ini

@@ -16,6 +16,7 @@ deps =
     BeautifulSoup4
     typogrify
     lxml
+    six
 
 [testenv:py33]
 deps =
@@ -24,3 +25,4 @@ deps =
     BeautifulSoup4
     git+https://github.com/dmdm/typogrify.git@py3k#egg=typogrify
     lxml
+    six