Fixed a bunch of errors detected by pychecker -- unneeded imports and shadows of builtin variable names
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2058 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
ce40c4a9e2
commit
c12c225a66
|
@ -16,10 +16,10 @@ def compile_messages():
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
for (dirpath, dirnames, filenames) in os.walk(basedir):
|
for (dirpath, dirnames, filenames) in os.walk(basedir):
|
||||||
for file in filenames:
|
for f in filenames:
|
||||||
if file.endswith('.po'):
|
if f.endswith('.po'):
|
||||||
sys.stderr.write('processing file %s in %s\n' % (file, dirpath))
|
sys.stderr.write('processing file %s in %s\n' % (f, dirpath))
|
||||||
pf = os.path.splitext(os.path.join(dirpath, file))[0]
|
pf = os.path.splitext(os.path.join(dirpath, f))[0]
|
||||||
cmd = 'msgfmt -o "%s.mo" "%s.po"' % (pf, pf)
|
cmd = 'msgfmt -o "%s.mo" "%s.po"' % (pf, pf)
|
||||||
os.system(cmd)
|
os.system(cmd)
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
import getopt
|
|
||||||
|
|
||||||
def unique_messages():
|
def unique_messages():
|
||||||
basedir = None
|
basedir = None
|
||||||
|
@ -16,10 +15,10 @@ def unique_messages():
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
for (dirpath, dirnames, filenames) in os.walk(basedir):
|
for (dirpath, dirnames, filenames) in os.walk(basedir):
|
||||||
for file in filenames:
|
for f in filenames:
|
||||||
if file.endswith('.po'):
|
if f.endswith('.po'):
|
||||||
sys.stderr.write('processing file %s in %s\n' % (file, dirpath))
|
sys.stderr.write('processing file %s in %s\n' % (f, dirpath))
|
||||||
pf = os.path.splitext(os.path.join(dirpath, file))[0]
|
pf = os.path.splitext(os.path.join(dirpath, f))[0]
|
||||||
cmd = 'msguniq "%s.po"' % pf
|
cmd = 'msguniq "%s.po"' % pf
|
||||||
stdout = os.popen(cmd)
|
stdout = os.popen(cmd)
|
||||||
msg = stdout.read()
|
msg = stdout.read()
|
||||||
|
|
|
@ -12,13 +12,14 @@ DOTS = ['·', '*', '\xe2\x80\xa2', '•', '•', '•']
|
||||||
unencoded_ampersands_re = re.compile(r'&(?!(\w+|#\d+);)')
|
unencoded_ampersands_re = re.compile(r'&(?!(\w+|#\d+);)')
|
||||||
word_split_re = re.compile(r'(\s+)')
|
word_split_re = re.compile(r'(\s+)')
|
||||||
punctuation_re = re.compile('^(?P<lead>(?:%s)*)(?P<middle>.*?)(?P<trail>(?:%s)*)$' % \
|
punctuation_re = re.compile('^(?P<lead>(?:%s)*)(?P<middle>.*?)(?P<trail>(?:%s)*)$' % \
|
||||||
('|'.join([re.escape(p) for p in LEADING_PUNCTUATION]),
|
('|'.join([re.escape(x) for x in LEADING_PUNCTUATION]),
|
||||||
'|'.join([re.escape(p) for p in TRAILING_PUNCTUATION])))
|
'|'.join([re.escape(x) for x in TRAILING_PUNCTUATION])))
|
||||||
simple_email_re = re.compile(r'^\S+@[a-zA-Z0-9._-]+\.[a-zA-Z0-9._-]+$')
|
simple_email_re = re.compile(r'^\S+@[a-zA-Z0-9._-]+\.[a-zA-Z0-9._-]+$')
|
||||||
link_target_attribute_re = re.compile(r'(<a [^>]*?)target=[^\s>]+')
|
link_target_attribute_re = re.compile(r'(<a [^>]*?)target=[^\s>]+')
|
||||||
html_gunk_re = re.compile(r'(?:<br clear="all">|<i><\/i>|<b><\/b>|<em><\/em>|<strong><\/strong>|<\/?smallcaps>|<\/?uppercase>)', re.IGNORECASE)
|
html_gunk_re = re.compile(r'(?:<br clear="all">|<i><\/i>|<b><\/b>|<em><\/em>|<strong><\/strong>|<\/?smallcaps>|<\/?uppercase>)', re.IGNORECASE)
|
||||||
hard_coded_bullets_re = re.compile(r'((?:<p>(?:%s).*?[a-zA-Z].*?</p>\s*)+)' % '|'.join([re.escape(d) for d in DOTS]), re.DOTALL)
|
hard_coded_bullets_re = re.compile(r'((?:<p>(?:%s).*?[a-zA-Z].*?</p>\s*)+)' % '|'.join([re.escape(x) for x in DOTS]), re.DOTALL)
|
||||||
trailing_empty_content_re = re.compile(r'(?:<p>(?: |\s|<br \/>)*?</p>\s*)+\Z')
|
trailing_empty_content_re = re.compile(r'(?:<p>(?: |\s|<br \/>)*?</p>\s*)+\Z')
|
||||||
|
del x # Temporary variable
|
||||||
|
|
||||||
def escape(html):
|
def escape(html):
|
||||||
"Returns the given HTML with ampersands, quotes and carets encoded"
|
"Returns the given HTML with ampersands, quotes and carets encoded"
|
||||||
|
|
|
@ -2,7 +2,7 @@ from django.conf import settings
|
||||||
from django.core.template import Template, Context, TemplateDoesNotExist
|
from django.core.template import Template, Context, TemplateDoesNotExist
|
||||||
from django.utils.html import escape
|
from django.utils.html import escape
|
||||||
from django.utils.httpwrappers import HttpResponseServerError, HttpResponseNotFound
|
from django.utils.httpwrappers import HttpResponseServerError, HttpResponseNotFound
|
||||||
import inspect, os, re, sys
|
import os, re
|
||||||
from itertools import count, izip
|
from itertools import count, izip
|
||||||
from os.path import dirname, join as pathjoin
|
from os.path import dirname, join as pathjoin
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,9 @@
|
||||||
import re
|
|
||||||
import os
|
|
||||||
|
|
||||||
import gettext as gettext_module
|
|
||||||
|
|
||||||
from django.utils import httpwrappers
|
from django.utils import httpwrappers
|
||||||
from django.utils.translation import check_for_language, activate, to_locale, get_language
|
from django.utils.translation import check_for_language, activate, to_locale, get_language
|
||||||
from django.utils.text import javascript_quote
|
from django.utils.text import javascript_quote
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
import os
|
||||||
|
import gettext as gettext_module
|
||||||
|
|
||||||
def set_language(request):
|
def set_language(request):
|
||||||
"""
|
"""
|
||||||
|
@ -145,7 +142,7 @@ def javascript_catalog(request, domain='djangojs', packages=None):
|
||||||
for path in paths:
|
for path in paths:
|
||||||
try:
|
try:
|
||||||
catalog = gettext_module.translation(domain, path, [default_locale])
|
catalog = gettext_module.translation(domain, path, [default_locale])
|
||||||
except IOError, e:
|
except IOError:
|
||||||
catalog = None
|
catalog = None
|
||||||
if catalog is not None:
|
if catalog is not None:
|
||||||
t.update(catalog._catalog)
|
t.update(catalog._catalog)
|
||||||
|
@ -154,7 +151,7 @@ def javascript_catalog(request, domain='djangojs', packages=None):
|
||||||
for path in paths:
|
for path in paths:
|
||||||
try:
|
try:
|
||||||
catalog = gettext_module.translation(domain, path, [locale])
|
catalog = gettext_module.translation(domain, path, [locale])
|
||||||
except IOError, e:
|
except IOError:
|
||||||
catalog = None
|
catalog = None
|
||||||
if catalog is not None:
|
if catalog is not None:
|
||||||
t.update(catalog._catalog)
|
t.update(catalog._catalog)
|
||||||
|
|
Loading…
Reference in New Issue