Cleanup and a bit of modernization.

Author: cmlenz

babeldjango/__init__.py

@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2007 Edgewall Software
-# All rights reserved.
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution. The terms
-# are also available at http://babel.edgewall.org/wiki/License.
-#
-# This software consists of voluntary contributions made by many
-# individuals. For the exact contribution history, see the revision
-# history and logs, available at http://babel.edgewall.org/log/.

babeldjango/extract.py

@@ -1,15 +1,4 @@
 # -*- coding: utf-8 -*-
-#
-# Copyright (C) 2007 Edgewall Software
-# All rights reserved.
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution. The terms
-# are also available at http://babel.edgewall.org/wiki/License.
-#
-# This software consists of voluntary contributions made by many
-# individuals. For the exact contribution history, see the revision
-# history and logs, available at http://babel.edgewall.org/log/.
 
 from babel.core import *
 
@@ -18,6 +7,7 @@
                                                 endblock_re, plural_re, \
                                                 constant_re
 
+
 def extract_django(fileobj, keywords, comment_tags, options):
     """Extract messages from Django template files.
 

babeldjango/middleware.py

@@ -1,15 +1,4 @@
 # -*- coding: utf-8 -*-
-#
-# Copyright (C) 2007-2010 Edgewall Software
-# All rights reserved.
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution. The terms
-# are also available at http://babel.edgewall.org/wiki/License.
-#
-# This software consists of voluntary contributions made by many
-# individuals. For the exact contribution history, see the revision
-# history and logs, available at http://babel.edgewall.org/log/.
 
 from babel import Locale, UnknownLocaleError
 from django.utils.translation import get_language
@@ -22,10 +11,11 @@
 
 _thread_locals = local()
 
+
 def get_current_locale():
     """Get current locale data outside views.
 
-    See http://babel.edgewall.org/wiki/ApiDocs/babel.core for Locale
+    See http://babel.pocoo.org/docs/api/core/#babel.core.Locale for Locale
     objects documentation
     """
     return getattr(_thread_locals, 'locale', None)

babeldjango/templatetags/__init__.py

@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2007 Edgewall Software
-# All rights reserved.
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution. The terms
-# are also available at http://babel.edgewall.org/wiki/License.
-#
-# This software consists of voluntary contributions made by many
-# individuals. For the exact contribution history, see the revision
-# history and logs, available at http://babel.edgewall.org/log/.

babeldjango/templatetags/babel.py

@@ -1,15 +1,4 @@
 # -*- coding: utf-8 -*-
-#
-# Copyright (C) 2007 Edgewall Software
-# All rights reserved.
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution. The terms
-# are also available at http://babel.edgewall.org/wiki/License.
-#
-# This software consists of voluntary contributions made by many
-# individuals. For the exact contribution history, see the revision
-# history and logs, available at http://babel.edgewall.org/log/.
 
 from django.conf import settings
 from django.template import Library
@@ -27,6 +16,7 @@
 
 register = Library()
 
+
 def _get_format():
     locale = get_current_locale()
     if not locale:
@@ -37,34 +27,42 @@ def _get_format():
         tzinfo = None
     return Format(locale, tzinfo)
 
+
+@register.filter
 def datefmt(date=None, format='medium'):
     return _get_format().date(date, format=format)
-datefmt = register.filter(datefmt)
 
+
+@register.filter
 def datetimefmt(datetime=None, format='medium'):
     return _get_format().datetime(datetime, format=format)
-datetimefmt = register.filter(datetimefmt)
 
+
+@register.filter
 def timefmt(time=None, format='medium'):
     return _get_format().time(time, format=format)
-timefmt = register.filter(timefmt)
 
+
+@register.filter
 def numberfmt(number):
     return _get_format().number(number)
-numberfmt = register.filter(numberfmt)
 
+
+@register.filter
 def decimalfmt(number, format=None):
     return _get_format().decimal(number, format=format)
-decimalfmt = register.filter(decimalfmt)
 
+
+@register.filter
 def currencyfmt(number, currency):
     return _get_format().currency(number, currency)
-currencyfmt = register.filter(currencyfmt)
 
+
+@register.filter
 def percentfmt(number, format=None):
     return _get_format().percent(number, format=format)
-percentfmt = register.filter(percentfmt)
 
+
+@register.filter
 def scientificfmt(number):
     return _get_format().scientific(number)
-scientificfmt = register.filter(scientificfmt)

setup.py

@@ -1,16 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-#
-# Copyright (C) 2007 Edgewall Software
-# All rights reserved.
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution. The terms
-# are also available at http://babel.edgewall.org/wiki/License.
-#
-# This software consists of voluntary contributions made by many
-# individuals. For the exact contribution history, see the revision
-# history and logs, available at http://babel.edgewall.org/log/.
 
 try:
     from setuptools import setup
@@ -20,15 +9,26 @@
 setup(
     name = 'BabelDjango',
     description = 'Utilities for using Babel in Django',
-    version = '0.2.3',
+    version = '1.0',
     license = 'BSD',
-    author  = 'Edgewall Software',
-    author_email = 'python-babel@googlegroups.com',
-    url = 'http://babel.edgewall.org/wiki/BabelDjango',
+    author  = 'Christopher Lenz',
+    author_email = 'cmlenz@gmail.com',
+    url = 'https://github.com/cmlenz/django-babel',
 
     packages = ['babeldjango', 'babeldjango.templatetags'],
     install_requires = ['Babel'],
 
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Web Environment',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: BSD License',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 3',
+        'Topic :: Software Development :: Libraries :: Python Modules',
+    ],
+
     entry_points = """
     [babel.extractors]
     django = babeldjango.extract:extract_django