Skip to content

Commit 2948312

Browse files
committed
More code cleanup
1 parent ff8e5d7 commit 2948312

File tree

5 files changed

+17
-23
lines changed

5 files changed

+17
-23
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ would render: **4/1/07**, and
200200

201201
would render: **Sun, Apr 01 2007 AD**
202202

203-
### `datetimefmt`
203+
### `datetimefmt`
204204

205205
Renders a string representation of a date and time.
206206

django_babel/extract.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
# -*- coding: utf-8 -*-
2-
from babel.core import *
3-
42
from django.template import Lexer, TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK
5-
from django.utils.translation.trans_real import inline_re, block_re, \
6-
endblock_re, plural_re, \
7-
constant_re
3+
from django.utils.translation.trans_real import (
4+
inline_re, block_re, endblock_re, plural_re, constant_re)
85

96

107
def extract_django(fileobj, keywords, comment_tags, options):
@@ -89,7 +86,7 @@ def extract_django(fileobj, keywords, comment_tags, options):
8986
yield lineno, None, unicode(cmatch.group(1)), []
9087
for p in parts[1:]:
9188
if p.find(':_(') >= 0:
92-
p1 = p.split(':',1)[1]
89+
p1 = p.split(':', 1)[1]
9390
if p1[0] == '_':
9491
p1 = p1[1:]
9592
if p1[0] == '(':

django_babel/middleware.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ def get_current_locale():
2323

2424

2525
class LocaleMiddleware(object):
26+
2627
"""Simple Django middleware that makes available a Babel `Locale` object
2728
via the `request.locale` attribute.
2829
"""

django_babel/templatetags/babel.py

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,4 @@
11
# -*- coding: utf-8 -*-
2-
#
3-
# Copyright (C) 2007 Edgewall Software
4-
# All rights reserved.
5-
#
6-
# This software is licensed as described in the file COPYING, which
7-
# you should have received as part of this distribution. The terms
8-
# are also available at http://babel.edgewall.org/wiki/License.
9-
#
10-
# This software consists of voluntary contributions made by many
11-
# individuals. For the exact contribution history, see the revision
12-
# history and logs, available at http://babel.edgewall.org/log/.
132

143
from django.conf import settings
154
from django.template import Library
@@ -27,6 +16,7 @@
2716

2817
register = Library()
2918

19+
3020
def _get_format():
3121
locale = get_current_locale()
3222
if not locale:
@@ -37,34 +27,42 @@ def _get_format():
3727
tzinfo = None
3828
return Format(locale, tzinfo)
3929

30+
4031
def datefmt(date=None, format='medium'):
4132
return _get_format().date(date, format=format)
4233
datefmt = register.filter(datefmt)
4334

35+
4436
def datetimefmt(datetime=None, format='medium'):
4537
return _get_format().datetime(datetime, format=format)
4638
datetimefmt = register.filter(datetimefmt)
4739

40+
4841
def timefmt(time=None, format='medium'):
4942
return _get_format().time(time, format=format)
5043
timefmt = register.filter(timefmt)
5144

45+
5246
def numberfmt(number):
5347
return _get_format().number(number)
5448
numberfmt = register.filter(numberfmt)
5549

50+
5651
def decimalfmt(number, format=None):
5752
return _get_format().decimal(number, format=format)
5853
decimalfmt = register.filter(decimalfmt)
5954

55+
6056
def currencyfmt(number, currency):
6157
return _get_format().currency(number, currency)
6258
currencyfmt = register.filter(currencyfmt)
6359

60+
6461
def percentfmt(number, format=None):
6562
return _get_format().percent(number, format=format)
6663
percentfmt = register.filter(percentfmt)
6764

65+
6866
def scientificfmt(number):
6967
return _get_format().scientific(number)
7068
scientificfmt = register.filter(scientificfmt)

setup.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python
22
# -*- coding: utf-8 -*-
33

4-
from setuptools import setup
4+
from setuptools import setup, find_packages
55

66

77
setup(
@@ -12,9 +12,7 @@
1212
author='Christopher Lenz',
1313
author_email='[email protected]',
1414
url='http://github.com/graingert/django-babel/',
15-
packages=find_packages(
16-
exclude=["*.tests", "*.tests.*", "tests.*", "tests"],
17-
),
15+
packages=find_packages(exclude=('tests',)),
1816
install_requires=['Babel'],
1917
classifiers=[
2018
'Development Status :: 4 - Beta',
@@ -25,7 +23,7 @@
2523
'Programming Language :: Python',
2624
'Topic :: Software Development :: Libraries :: Python Modules',
2725
],
28-
entry_points = """
26+
entry_points="""
2927
[babel.extractors]
3028
django = babeldjango.extract:extract_django
3129
""",

0 commit comments

Comments
 (0)