merge with 0.5

1 files changed, 3 insertions, 2 deletions

diff --git a/setup.py b/setup.py
index 7bd5be6c..095ef114 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@ are already present, work fine and can be seen "in action" in the Python docs:
   and inclusion of appropriately formatted docstrings.
 '''
 
-requires = ['Pygments>=0.8', 'Jinja>=1.2', 'docutils>=0.4']
+requires = ['Pygments>=0.8', 'Jinja2>=2.0', 'docutils>=0.4']
 
 if sys.version_info < (2, 4):
     print 'ERROR: Sphinx requires at least Python 2.4 to run.'
@@ -98,7 +98,8 @@ else:
                 else:
                     for locale in os.listdir(self.directory):
                         po_file = os.path.join(self.directory, locale,
-                                               'LC_MESSAGES', self.domain + '.po')
+                                               'LC_MESSAGES',
+                                               self.domain + '.po')
                         if os.path.exists(po_file):
                             po_files.append((locale, po_file))
                             js_files.append(os.path.join(self.directory, locale,