From 061aae5d1311fc683a5c8a79331eb315c24b8853 Mon Sep 17 00:00:00 2001
From: Andreas Kotes <andreas.kotes@nokia.com>
Date: Fri, 27 Dec 2013 20:23:12 +0100
Subject: [PATCH] Address dependency on six during dev/testing. Fixes #1205.

---
 .travis.yml          | 2 +-
 dev_requirements.txt | 1 +
 tox.ini              | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 62373e68..1e71e4a1 100644
--- a/.travis.yml
+++ b/.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:
diff --git a/dev_requirements.txt b/dev_requirements.txt
index c90ac630..a860d1d7 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -6,6 +6,7 @@ Markdown
 BeautifulSoup4
 lxml
 typogrify
+six
 
 # To perform release
 bumpr==0.2.0
diff --git a/tox.ini b/tox.ini
index 440216cf..6dffe184 100644
--- a/tox.ini
+++ b/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