summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAlexis Metaireau <alexis@notmyidea.org>2012-02-28 19:00:15 +0100
committerAlexis Metaireau <alexis@notmyidea.org>2012-02-28 19:00:15 +0100
commitf31d588839c6b63b45774ddbb4d7ee8d8873a819 (patch)
tree29b20bdf00b786d505ca81dca7d68989e70e5409 /tests
parente0308e352889426c4e39bc1995e1f19d66ee1b33 (diff)
parent097a781e0e6e9275228056e23bc3566899945a60 (diff)
downloadpelican-2.8.tar.gz
Merge branch 'master' of github.com:ametaireau/pelican2.8
Diffstat (limited to 'tests')
-rw-r--r--[-rwxr-xr-x]tests/default_conf.py0
-rw-r--r--tests/test_readers.py3
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/default_conf.py b/tests/default_conf.py
index acb7d9da..acb7d9da 100755..100644
--- a/tests/default_conf.py
+++ b/tests/default_conf.py
diff --git a/tests/test_readers.py b/tests/test_readers.py
index 211fb9be..1e920e09 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -4,8 +4,9 @@ try:
except ImportError, e:
import unittest as unittest2
-import os
import datetime
+import os
+
from pelican import readers
CUR_DIR = os.path.dirname(__file__)