Merge branch 'master' of git://github.com/EnTeQuAk/django-babel into sync-EnTeQuAk

Author: Thomas Grainger

.gitignore

@@ -1,4 +1,6 @@
 build
+.cache
+.coverage
 dist
 *.pyc
 django_babel.egg-info

CHANGELOG.rst

@@ -1,11 +1,45 @@
 Changelog
 =========
 
-0.4 - `master`_
----------------
+0.4.0 - 2015-04-22
+------------------
+
+* Add compatibility for Django 1.8
+* Add compatibility for latest django master
+* Various python 3 fixes
+
+
+0.3.9 - 2014-12-24
+------------------
+
+* Fix dependencies on Django/Babel to use lower-case egg names.
+
+0.3.8 - 2014-10-14
+------------------
+
+* Fix old reference to `babeldjango` module in entry points.
+
+0.3.7 - 2014-10-14
+------------------
 
-.. note:: This version is not yet released and is under active development.
+* Fix Python 3.x compatibility in `babel makemessages` command.
+
+0.3.6 - 2014-10-05
+------------------
+
+* Django 1.7 compatibility
+
+
+0.3.5 - 2014-09-10
+------------------
+
+* Create .po and .pot files if not existing, plus it's specific base directories.
+
+
+0.3.4 - 2014-05-25
+------------------
 
+* Fixed django compatibility
 
 0.3.3 - 2014-04-22
 ------------------

django_babel/extract.py

@@ -1,8 +1,13 @@
 # -*- coding: utf-8 -*-
-from django.template import Lexer, TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK
+try:
+    from django.template import Lexer, TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK
+except ImportError:
+    # Django 1.8 moved most stuff to .base
+    from django.template.base import Lexer, TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK
+
 from django.utils.translation.trans_real import (
     inline_re, block_re, endblock_re, plural_re, constant_re)
-from django.utils.encoding import smart_text as smart_unicode
+from django.utils.encoding import smart_text
 
 
 def extract_django(fileobj, keywords, comment_tags, options):
@@ -38,14 +43,14 @@ def extract_django(fileobj, keywords, comment_tags, options):
                         yield (
                             lineno,
                             'ngettext',
-                            (smart_unicode(u''.join(singular)),
-                             smart_unicode(u''.join(plural))),
+                            (smart_text(u''.join(singular)),
+                             smart_text(u''.join(plural))),
                             [])
                     else:
                         yield (
                             lineno,
                             None,
-                            smart_unicode(u''.join(singular)),
+                            smart_text(u''.join(singular)),
                             [])
 
                     intrans = False
@@ -78,22 +83,22 @@ def extract_django(fileobj, keywords, comment_tags, options):
                         g = g.strip('"')
                     elif g[0] == "'":
                         g = g.strip("'")
-                    yield lineno, None, smart_unicode(g), []
+                    yield lineno, None, smart_text(g), []
                 elif bmatch:
                     for fmatch in constant_re.findall(t.contents):
-                        yield lineno, None, smart_unicode(fmatch), []
+                        yield lineno, None, smart_text(fmatch), []
                     intrans = True
                     inplural = False
                     singular = []
                     plural = []
                 elif cmatches:
                     for cmatch in cmatches:
-                        yield lineno, None, smart_unicode(cmatch), []
+                        yield lineno, None, smart_text(cmatch), []
             elif t.token_type == TOKEN_VAR:
                 parts = t.contents.split('|')
                 cmatch = constant_re.match(parts[0])
                 if cmatch:
-                    yield lineno, None, smart_unicode(cmatch.group(1)), []
+                    yield lineno, None, smart_text(cmatch.group(1)), []
                 for p in parts[1:]:
                     if p.find(':_(') >= 0:
                         p1 = p.split(':', 1)[1]
@@ -105,4 +110,4 @@ def extract_django(fileobj, keywords, comment_tags, options):
                             p1 = p1.strip("'")
                         elif p1[0] == '"':
                             p1 = p1.strip('"')
-                        yield lineno, None, smart_unicode(p1), []
+                        yield lineno, None, smart_text(p1), []

django_babel/management/commands/babel.py

@@ -62,8 +62,13 @@ def handle_makemessages(self, **options):
 
         for path in locale_paths:
             potfile = os.path.join(path, '%s.pot' % domain)
+
+            if not os.path.exists(path):
+                os.makedirs(path)
+
             if not os.path.exists(potfile):
-                continue
+                with open(potfile, 'wb') as fobj:
+                    fobj.write(b'')
 
             cmd = ['pybabel', 'extract', '-o', potfile]
 
@@ -75,6 +80,19 @@ def handle_makemessages(self, **options):
             call(cmd)
 
             for locale in locales:
+                pofile = os.path.join(
+                    os.path.dirname(potfile),
+                    locale,
+                    'LC_MESSAGES',
+                    '%s.po' % domain)
+
+                if not os.path.isdir(os.path.dirname(pofile)):
+                    os.makedirs(os.path.dirname(pofile))
+
+                if not os.path.exists(pofile):
+                    with open(pofile, 'wb') as fobj:
+                        fobj.write(b'')
+
                 cmd = ['pybabel', 'update', '-D', domain,
                        '-i', potfile,
                        '-d', os.path.relpath(path),

docs/conf.py

@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.4'
+version = '0.3.4'
 # The full version, including alpha/beta/rc tags.
-release = '0.4-dev'
+release = '0.3.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import os
-import sys
 import codecs
 from setuptools import setup, find_packages
 
@@ -12,17 +11,11 @@ def read(*parts):
         return fp.read()
 
 
-install_requires = [
-    'Django>=1.4,<1.9',
-    'Babel>=1.3',
-]
-
-
 setup(
     name='django-babel',
     description='Utilities for using Babel in Django',
     long_description=read('README.rst') + u'\n\n' + read('CHANGELOG.rst'),
-    version='0.4-dev',
+    version='0.4.0',
     license='BSD',
     author='Christopher Grebs',
     author_email='[email protected]',
@@ -31,8 +24,8 @@ def read(*parts):
     url='https://github.com/python-babel/django-babel/',
     packages=find_packages(exclude=('tests',)),
     install_requires=[
-        'Django>=1.4,<1.8',
-        'Babel>=1.3',
+        'django>=1.4,<1.9',
+        'babel>=1.3',
     ],
     classifiers=[
         'Development Status :: 4 - Beta',
@@ -47,14 +40,13 @@ def read(*parts):
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Programming Language :: Python :: Implementation :: CPython',
     ],
     entry_points={
         'babel.extractors': [
-            'django = babeldjango.extract:extract_django',
+            'django = django_babel.extract:extract_django',
         ]
     }
 )