mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #21287 -- Fixed E123 pep8 warnings

Browse Source
This commit is contained in:
Alasdair Nicol
2013-10-18 10:02:43 +01:00
parent 65750b8352
commit a800036981
71 changed files with 152 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/admin/filters.py
View File

@@ -242,7 +242,7 @@ class BooleanFieldListFilter(FieldListFilter):
'selected': self.lookup_val == lookup and not self.lookup_val2,
'query_string': cl.get_query_string({
self.lookup_kwarg: lookup,
}, [self.lookup_kwarg2]),
}, [self.lookup_kwarg2]),
'display': title,
}
if isinstance(self.field, models.NullBooleanField):
@@ -250,7 +250,7 @@ class BooleanFieldListFilter(FieldListFilter):
'selected': self.lookup_val2 == 'True',
'query_string': cl.get_query_string({
self.lookup_kwarg2: 'True',
}, [self.lookup_kwarg]),
}, [self.lookup_kwarg]),
'display': _('Unknown'),
}

2
django/contrib/admin/options.py
View File

@@ -1200,7 +1200,7 @@ class ModelAdmin(BaseModelAdmin):
'The %(name)s "%(obj)s" was deleted successfully.') % {
'name': force_text(opts.verbose_name),
'obj': force_text(obj_display)
}, messages.SUCCESS)
}, messages.SUCCESS)
if self.has_change_permission(request, None):
post_url = reverse('admin:%s_%s_changelist' %

2
django/contrib/auth/management/commands/changepassword.py
View File

@@ -35,7 +35,7 @@ class Command(BaseCommand):
try:
u = UserModel._default_manager.using(options.get('database')).get(**{
UserModel.USERNAME_FIELD: username
})
})
except UserModel.DoesNotExist:
raise CommandError("user '%s' does not exist" % username)

30
django/contrib/auth/tests/test_forms.py
View File

@@ -32,7 +32,7 @@ class UserCreationFormTest(TestCase):
'username': 'testclient',
'password1': 'test123',
'password2': 'test123',
}
}
form = UserCreationForm(data)
self.assertFalse(form.is_valid())
self.assertEqual(form["username"].errors,
@@ -43,7 +43,7 @@ class UserCreationFormTest(TestCase):
'username': 'jsmith!',
'password1': 'test123',
'password2': 'test123',
}
}
form = UserCreationForm(data)
self.assertFalse(form.is_valid())
self.assertEqual(form["username"].errors,
@@ -55,7 +55,7 @@ class UserCreationFormTest(TestCase):
'username': 'jsmith',
'password1': 'test123',
'password2': 'test',
}
}
form = UserCreationForm(data)
self.assertFalse(form.is_valid())
self.assertEqual(form["password2"].errors,
@@ -82,7 +82,7 @@ class UserCreationFormTest(TestCase):
'username': 'jsmith@example.com',
'password1': 'test123',
'password2': 'test123',
}
}
form = UserCreationForm(data)
self.assertTrue(form.is_valid())
u = form.save()
@@ -101,7 +101,7 @@ class AuthenticationFormTest(TestCase):
data = {
'username': 'jsmith_does_not_exist',
'password': 'test123',
}
}
form = AuthenticationForm(None, data)
self.assertFalse(form.is_valid())
self.assertEqual(form.non_field_errors(),
@@ -114,7 +114,7 @@ class AuthenticationFormTest(TestCase):
data = {
'username': 'inactive',
'password': 'password',
}
}
form = AuthenticationForm(None, data)
self.assertFalse(form.is_valid())
self.assertEqual(form.non_field_errors(),
@@ -126,7 +126,7 @@ class AuthenticationFormTest(TestCase):
data = {
'username': 'inactive',
'password': 'password',
}
}
form = AuthenticationForm(None, data)
self.assertFalse(form.is_valid())
self.assertEqual(form.non_field_errors(),
@@ -137,7 +137,7 @@ class AuthenticationFormTest(TestCase):
data = {
'username': 'inactive',
'password': 'password',
}
}
class AuthenticationFormWithInactiveUsersOkay(AuthenticationForm):
def confirm_login_allowed(self, user):
@@ -161,7 +161,7 @@ class AuthenticationFormTest(TestCase):
data = {
'username': 'testclient',
'password': 'password',
}
}
form = PickyAuthenticationForm(None, data)
self.assertFalse(form.is_valid())
self.assertEqual(form.non_field_errors(), ["Sorry, nobody's allowed in."])
@@ -171,7 +171,7 @@ class AuthenticationFormTest(TestCase):
data = {
'username': 'testclient',
'password': 'password',
}
}
form = AuthenticationForm(None, data)
self.assertTrue(form.is_valid())
self.assertEqual(form.non_field_errors(), [])
@@ -215,7 +215,7 @@ class SetPasswordFormTest(TestCase):
data = {
'new_password1': 'abc123',
'new_password2': 'abc',
}
}
form = SetPasswordForm(user, data)
self.assertFalse(form.is_valid())
self.assertEqual(form["new_password2"].errors,
@@ -226,7 +226,7 @@ class SetPasswordFormTest(TestCase):
data = {
'new_password1': 'abc123',
'new_password2': 'abc123',
}
}
form = SetPasswordForm(user, data)
self.assertTrue(form.is_valid())
@@ -243,7 +243,7 @@ class PasswordChangeFormTest(TestCase):
'old_password': 'test',
'new_password1': 'abc123',
'new_password2': 'abc123',
}
}
form = PasswordChangeForm(user, data)
self.assertFalse(form.is_valid())
self.assertEqual(form["old_password"].errors,
@@ -256,7 +256,7 @@ class PasswordChangeFormTest(TestCase):
'old_password': 'password',
'new_password1': 'abc123',
'new_password2': 'abc',
}
}
form = PasswordChangeForm(user, data)
self.assertFalse(form.is_valid())
self.assertEqual(form["new_password2"].errors,
@@ -269,7 +269,7 @@ class PasswordChangeFormTest(TestCase):
'old_password': 'password',
'new_password1': 'abc123',
'new_password2': 'abc123',
}
}
form = PasswordChangeForm(user, data)
self.assertTrue(form.is_valid())

8
django/contrib/auth/tests/test_views.py
View File

@@ -49,7 +49,7 @@ class AuthViewsTestCase(TestCase):
response = self.client.post('/login/', {
'username': 'testclient',
'password': password,
})
})
self.assertTrue(SESSION_KEY in self.client.session)
return response
@@ -180,7 +180,7 @@ class PasswordResetTest(AuthViewsTestCase):
response = self.client.post('/password_reset/',
{'email': 'staffmember@example.com'},
HTTP_HOST='www.example:dr.frankenstein@evil.tld'
)
)
self.assertEqual(response.status_code, 400)
self.assertEqual(len(mail.outbox), 0)
self.assertEqual(len(logger_calls), 1)
@@ -193,7 +193,7 @@ class PasswordResetTest(AuthViewsTestCase):
response = self.client.post('/admin_password_reset/',
{'email': 'staffmember@example.com'},
HTTP_HOST='www.example:dr.frankenstein@evil.tld'
)
)
self.assertEqual(response.status_code, 400)
self.assertEqual(len(mail.outbox), 0)
self.assertEqual(len(logger_calls), 1)
@@ -357,7 +357,7 @@ class ChangePasswordTest(AuthViewsTestCase):
})
self.assertFormError(response, AuthenticationForm.error_messages['invalid_login'] % {
'username': User._meta.get_field('username').verbose_name
})
})
def logout(self):
self.client.get('/logout/')

2
django/contrib/contenttypes/generic.py
View File

@@ -354,7 +354,7 @@ def create_generic_related_manager(superclass):
'%s__pk' % self.content_type_field_name: self.content_type.id,
'%s__in' % self.object_id_field_name:
set(obj._get_pk_val() for obj in instances)
}
}
qs = super(GenericRelatedObjectManager, self).get_queryset().using(db).filter(**query)
# We (possibly) need to convert object IDs to the type of the
# instances' PK in order to match up instances:

24
django/contrib/flatpages/tests/test_templatetags.py
View File

@@ -32,7 +32,7 @@ class FlatpageTemplateTagTests(TestCase):
"{% for page in flatpages %}"
"{{ page.title }},"
"{% endfor %}"
).render(Context())
).render(Context())
self.assertEqual(out, "A Flatpage,A Nested Flatpage,")
def test_get_flatpages_tag_for_anon_user(self):
@@ -43,9 +43,9 @@ class FlatpageTemplateTagTests(TestCase):
"{% for page in flatpages %}"
"{{ page.title }},"
"{% endfor %}"
).render(Context({
).render(Context({
'anonuser': AnonymousUser()
}))
}))
self.assertEqual(out, "A Flatpage,A Nested Flatpage,")
@skipIfCustomUser
@@ -58,9 +58,9 @@ class FlatpageTemplateTagTests(TestCase):
"{% for page in flatpages %}"
"{{ page.title }},"
"{% endfor %}"
).render(Context({
).render(Context({
'me': me
}))
}))
self.assertEqual(out, "A Flatpage,A Nested Flatpage,Sekrit Nested Flatpage,Sekrit Flatpage,")
def test_get_flatpages_with_prefix(self):
@@ -71,7 +71,7 @@ class FlatpageTemplateTagTests(TestCase):
"{% for page in location_flatpages %}"
"{{ page.title }},"
"{% endfor %}"
).render(Context())
).render(Context())
self.assertEqual(out, "A Nested Flatpage,")
def test_get_flatpages_with_prefix_for_anon_user(self):
@@ -82,9 +82,9 @@ class FlatpageTemplateTagTests(TestCase):
"{% for page in location_flatpages %}"
"{{ page.title }},"
"{% endfor %}"
).render(Context({
).render(Context({
'anonuser': AnonymousUser()
}))
}))
self.assertEqual(out, "A Nested Flatpage,")
@skipIfCustomUser
@@ -97,9 +97,9 @@ class FlatpageTemplateTagTests(TestCase):
"{% for page in location_flatpages %}"
"{{ page.title }},"
"{% endfor %}"
).render(Context({
).render(Context({
'me': me
}))
}))
self.assertEqual(out, "A Nested Flatpage,Sekrit Nested Flatpage,")
def test_get_flatpages_with_variable_prefix(self):
@@ -110,9 +110,9 @@ class FlatpageTemplateTagTests(TestCase):
"{% for page in location_flatpages %}"
"{{ page.title }},"
"{% endfor %}"
).render(Context({
).render(Context({
'location_prefix': '/location/'
}))
}))
self.assertEqual(out, "A Nested Flatpage,")
def test_parsing_errors(self):

4
django/contrib/gis/db/backends/oracle/operations.py
View File

@@ -114,7 +114,7 @@ class OracleOperations(DatabaseOperations, BaseSpatialOperations):
'distance_lt' : (SDODistance('<'), dtypes),
'distance_lte' : (SDODistance('<='), dtypes),
'dwithin' : (SDODWithin(), dtypes),
}
}
geometry_functions = {
'contains' : SDOOperation('SDO_CONTAINS'),
@@ -129,7 +129,7 @@ class OracleOperations(DatabaseOperations, BaseSpatialOperations):
'relate' : (SDORelate, six.string_types), # Oracle uses a different syntax, e.g., 'mask=inside+touch'
'touches' : SDOOperation('SDO_TOUCH'),
'within' : SDOOperation('SDO_INSIDE'),
}
}
geometry_functions.update(distance_functions)
gis_terms = set(['isnull'])

4
django/contrib/gis/db/backends/postgis/operations.py
View File

@@ -119,7 +119,7 @@ class PostGISOperations(DatabaseOperations, BaseSpatialOperations):
# The "&&" operator returns true if A's bounding box overlaps
# B's bounding box.
'bboverlaps' : PostGISOperator('&&'),
}
}
self.geometry_functions = {
'equals' : PostGISFunction(prefix, 'Equals'),
@@ -256,7 +256,7 @@ class PostGISOperations(DatabaseOperations, BaseSpatialOperations):
'GeoDjango requires at least PostGIS version 1.3. '
'Was the database created from a spatial database '
'template?' % self.connection.settings_dict['NAME']
)
)
version = vtup[1:]
return version

4
django/contrib/gis/db/backends/spatialite/operations.py
View File

@@ -103,14 +103,14 @@ class SpatiaLiteOperations(DatabaseOperations, BaseSpatialOperations):
# These are implemented here as synonyms for Equals
'same_as' : SpatiaLiteFunction('Equals'),
'exact' : SpatiaLiteFunction('Equals'),
}
}
distance_functions = {
'distance_gt' : (get_dist_ops('>'), dtypes),
'distance_gte' : (get_dist_ops('>='), dtypes),
'distance_lt' : (get_dist_ops('<'), dtypes),
'distance_lte' : (get_dist_ops('<='), dtypes),
}
}
geometry_functions.update(distance_functions)
def __init__(self, connection):

2
django/contrib/gis/forms/fields.py
View File

@@ -24,7 +24,7 @@ class GeometryField(forms.Field):
'invalid_geom_type' : _('Invalid geometry type.'),
'transform_error' : _('An error occurred when transforming the geometry '
'to the SRID of the geometry form field.'),
}
}
def __init__(self, **kwargs):
# Pop out attributes from the database field, or use sensible

2
django/contrib/gis/management/commands/ogrinspect.py
View File

@@ -67,7 +67,7 @@ class Command(LabelCommand):
'determined, the SRID of the data source is used.'),
make_option('--mapping', action='store_true', dest='mapping',
help='Generate mapping dictionary for use with `LayerMapping`.')
)
)
requires_model_validation = False

6
django/contrib/gis/measure.py
View File

@@ -252,7 +252,7 @@ class Distance(MeasureBase):
'survey_ft' : 0.304800609601,
'um' : 0.000001,
'yd': 0.9144,
}
}
# Unit aliases for `UNIT` terms encountered in Spatial Reference WKT.
ALIAS = {
@@ -292,7 +292,7 @@ class Distance(MeasureBase):
'U.S. Foot' : 'survey_ft',
'Yard (Indian)' : 'indian_yd',
'Yard (Sears)' : 'sears_yd'
}
}
LALIAS = dict((k.lower(), v) for k, v in ALIAS.items())
def __mul__(self, other):
@@ -305,7 +305,7 @@ class Distance(MeasureBase):
else:
raise TypeError('%(distance)s must be multiplied with number or %(distance)s' % {
"distance" : pretty_name(self.__class__),
})
})
class Area(MeasureBase):

2
django/contrib/gis/tests/geo3d/tests.py
View File

@@ -51,7 +51,7 @@ interstate_data = (
15.544, 14.975, 15.688, 16.099, 15.197, 17.268, 19.857,
15.435),
),
)
)
# Bounding box polygon for inner-loop of Houston (in projected coordinate
# system 32140), with elevation values from the National Elevation Dataset

4
django/contrib/gis/tests/geoadmin/tests.py
View File

@@ -28,7 +28,7 @@ class GeoAdminTest(TestCase):
def test_olmap_OSM_rendering(self):
geoadmin = admin.site._registry[City]
result = geoadmin.get_map_widget(City._meta.get_field('point'))(
).render('point', Point(-79.460734, 40.18476))
).render('point', Point(-79.460734, 40.18476))
self.assertIn(
"""geodjango_point.layers.base = new OpenLayers.Layer.OSM("OpenStreetMap (Mapnik)");""",
result)
@@ -36,7 +36,7 @@ class GeoAdminTest(TestCase):
def test_olmap_WMS_rendering(self):
geoadmin = admin.GeoModelAdmin(City, admin.site)
result = geoadmin.get_map_widget(City._meta.get_field('point'))(
).render('point', Point(-79.460734, 40.18476))
).render('point', Point(-79.460734, 40.18476))
self.assertIn(
"""geodjango_point.layers.base = new OpenLayers.Layer.WMS("OpenLayers WMS", "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: \'basic\', format: 'image/jpeg'});""",
result)

2
django/contrib/gis/utils/layermapping.py
View File

@@ -66,7 +66,7 @@ class LayerMapping(object):
models.BigIntegerField : (OFTInteger, OFTReal, OFTString),
models.SmallIntegerField : (OFTInteger, OFTReal, OFTString),
models.PositiveSmallIntegerField : (OFTInteger, OFTReal, OFTString),
}
}
def __init__(self, model, data, mapping, layer=0,
source_srs=None, encoding='utf-8',

2
django/contrib/messages/tests/base.py
View File

@@ -359,7 +359,7 @@ class BaseTests(object):
constants.WARNING: '',
constants.ERROR: 'bad',
29: 'custom',
}
}
)
def test_custom_tags(self):
storage = self.get_storage()

2
django/core/management/commands/loaddata.py
View File

@@ -144,7 +144,7 @@ class Command(BaseCommand):
'object_name': obj.object._meta.object_name,
'pk': obj.object.pk,
'error_msg': force_text(e)
},)
},)
raise
self.loaded_object_count += loaded_objects_in_fixture

2
django/core/management/templates.py
View File

@@ -51,7 +51,7 @@ class TemplateCommand(BaseCommand):
help='The file name(s) to render. '
'Separate multiple extensions with commas, or use '
'-n multiple times.')
)
)
requires_model_validation = False
# Can't import settings during this command, because they haven't
# necessarily been created.

2
django/db/utils.py
View File

@@ -82,7 +82,7 @@ class DatabaseErrorWrapper(object):
DatabaseError,
InterfaceError,
Error,
):
):
db_exc_type = getattr(self.wrapper.Database, dj_exc_type.__name__)
if issubclass(exc_type, db_exc_type):
dj_exc_value = dj_exc_type(*exc_value.args)

2
django/forms/formsets.py
View File

@@ -147,7 +147,7 @@ class BaseFormSet(object):
'auto_id': self.auto_id,
'prefix': self.add_prefix(i),
'error_class': self.error_class,
}
}
if self.is_bound:
defaults['data'] = self.data
defaults['files'] = self.files

2
django/forms/models.py
View File

@@ -688,7 +688,7 @@ class BaseModelFormSet(BaseFormSet):
return ugettext("Please correct the duplicate data for %(field)s, "
"which must be unique.") % {
"field": get_text_list(unique_check, six.text_type(_("and"))),
}
}
def get_date_error_message(self, date_check):
return ugettext("Please correct the duplicate data for %(field_name)s "

4
django/http/request.py
View File

@@ -526,9 +526,9 @@ def validate_host(host, allowed_hosts):
pattern == '*' or
pattern.startswith('.') and (
host.endswith(pattern) or host == pattern[1:]
) or
) or
pattern == host
)
)
if match:
return True

2
django/template/base.py
View File

@@ -495,7 +495,7 @@ constant_string = r"""
'strsq': r"'[^'\\]*(?:\\.[^'\\]*)*'", # single-quoted string
'i18n_open': re.escape("_("),
'i18n_close': re.escape(")"),
}
}
constant_string = constant_string.replace("\n", "")
filter_raw_string = r"""

2
django/test/html.py
View File

@@ -190,7 +190,7 @@ class Parser(HTMLParser):
if name == "class"
else (name, value)
for name, value in attrs
]
]
element = Element(tag, attrs)
self.current.append(element)
if tag not in self.SELF_CLOSING_TAGS:

2
django/test/runner.py
View File

@@ -25,7 +25,7 @@ class DiscoverRunner(object):
make_option('-p', '--pattern', action='store', dest='pattern',
default="test*.py",
help='The test matching pattern. Defaults to test*.py.'),
)
)
def __init__(self, pattern=None, top_level=None,
verbosity=1, interactive=True, failfast=False,

2
django/utils/crypto.py
View File

@@ -72,7 +72,7 @@ def get_random_string(length=12,
random.getstate(),
time.time(),
settings.SECRET_KEY)).encode('utf-8')
).digest())
).digest())
return ''.join(random.choice(allowed_chars) for i in range(length))

4
django/utils/jslex.py
View File

@@ -136,7 +136,7 @@ class JsLexer(Lexer):
Tok("punct", literals("{ } ( [ . ; , < > + - * % & | ^ ! ~ ? : ="), next='reg'),
Tok("string", r'"([^"\\]|(\\(.|\n)))*?"', next='div'),
Tok("string", r"'([^'\\]|(\\(.|\n)))*?'", next='div'),
]
]
both_after = [
Tok("other", r"."),
@@ -175,7 +175,7 @@ class JsLexer(Lexer):
[a-zA-Z0-9]* # trailing flags
""", next='div'),
] + both_after,
}
}
def __init__(self):
super(JsLexer, self).__init__(self.states, 'reg')