Removed a few trailing backslashes.

We have always been at war with trailing backslashes.
This commit is contained in:
Aymeric Augustin 2013-09-22 14:01:57 +02:00
parent ee0ef1b094
commit a5b062576b
14 changed files with 28 additions and 30 deletions

View File

@ -139,8 +139,8 @@ class Settings(BaseSettings):
if setting == setting.upper(): if setting == setting.upper():
setting_value = getattr(mod, setting) setting_value = getattr(mod, setting)
if setting in tuple_settings and \ if (setting in tuple_settings and
isinstance(setting_value, six.string_types): isinstance(setting_value, six.string_types)):
raise ImproperlyConfigured("The %s setting must be a tuple. " raise ImproperlyConfigured("The %s setting must be a tuple. "
"Please fix your settings." % setting) "Please fix your settings." % setting)

View File

@ -167,8 +167,9 @@ def get_default_username(check_db=True):
default_username = get_system_username() default_username = get_system_username()
try: try:
default_username = unicodedata.normalize('NFKD', default_username)\ default_username = (unicodedata.normalize('NFKD', default_username)
.encode('ascii', 'ignore').decode('ascii').replace(' ', '').lower() .encode('ascii', 'ignore').decode('ascii')
.replace(' ', '').lower())
except UnicodeDecodeError: except UnicodeDecodeError:
return '' return ''

View File

@ -136,8 +136,7 @@ class RemoteUserNoCreateTest(RemoteUserTest):
class that doesn't create unknown users. class that doesn't create unknown users.
""" """
backend =\ backend = 'django.contrib.auth.tests.test_remote_user.RemoteUserNoCreateBackend'
'django.contrib.auth.tests.test_remote_user.RemoteUserNoCreateBackend'
def test_unknown_user(self): def test_unknown_user(self):
num_users = User.objects.count() num_users = User.objects.count()
@ -173,8 +172,7 @@ class RemoteUserCustomTest(RemoteUserTest):
and configure_user methods. and configure_user methods.
""" """
backend =\ backend = 'django.contrib.auth.tests.test_remote_user.CustomRemoteUserBackend'
'django.contrib.auth.tests.test_remote_user.CustomRemoteUserBackend'
# REMOTE_USER strings with email addresses for the custom backend to # REMOTE_USER strings with email addresses for the custom backend to
# clean. # clean.
known_user = 'knownuser@example.com' known_user = 'knownuser@example.com'

View File

@ -111,8 +111,7 @@ class SQLEvaluator(object):
timedelta = node.children.pop() timedelta = node.children.pop()
sql, params = self.evaluate_node(node, qn, connection) sql, params = self.evaluate_node(node, qn, connection)
if timedelta.days == 0 and timedelta.seconds == 0 and \ if (timedelta.days == timedelta.seconds == timedelta.microseconds == 0):
timedelta.microseconds == 0:
return sql, params return sql, params
return connection.ops.date_interval_sql(sql, node.connector, timedelta), params return connection.ops.date_interval_sql(sql, node.connector, timedelta), params

View File

@ -83,8 +83,10 @@ def _get_queryset(klass):
elif isinstance(klass, ModelBase): elif isinstance(klass, ModelBase):
manager = klass._default_manager manager = klass._default_manager
else: else:
klass__name = klass.__name__ if isinstance(klass, type) \ if isinstance(klass, type)
else klass.__class__.__name__ klass__name = klass.__name__
else:
klass__name = klass.__class__.__name__
raise ValueError("Object is of type '%s', but must be a Django Model, " raise ValueError("Object is of type '%s', but must be a Django Model, "
"Manager, or QuerySet" % klass__name) "Manager, or QuerySet" % klass__name)
return manager.all() return manager.all()

View File

@ -133,8 +133,7 @@ class SimpleTemplateResponse(HttpResponse):
class TemplateResponse(SimpleTemplateResponse): class TemplateResponse(SimpleTemplateResponse):
rendering_attrs = SimpleTemplateResponse.rendering_attrs + \ rendering_attrs = SimpleTemplateResponse.rendering_attrs + ['_request', '_current_app']
['_request', '_current_app']
def __init__(self, request, template, context=None, content_type=None, def __init__(self, request, template, context=None, content_type=None,
status=None, current_app=None): status=None, current_app=None):

View File

@ -359,7 +359,7 @@ def do_translate(parser, token):
asvar = self.tag() asvar = self.tag()
else: else:
raise TemplateSyntaxError( raise TemplateSyntaxError(
"Only options for 'trans' are 'noop', " \ "Only options for 'trans' are 'noop', "
"'context \"xxx\"', and 'as VAR'.") "'context \"xxx\"', and 'as VAR'.")
return value, noop, asvar, message_context return value, noop, asvar, message_context
value, noop, asvar, message_context = TranslateParser(token.contents).top() value, noop, asvar, message_context = TranslateParser(token.contents).top()

View File

@ -524,8 +524,8 @@ class Client(RequestFactory):
not available. not available.
""" """
user = authenticate(**credentials) user = authenticate(**credentials)
if user and user.is_active \ if (user and user.is_active and
and 'django.contrib.sessions' in settings.INSTALLED_APPS: 'django.contrib.sessions' in settings.INSTALLED_APPS):
engine = import_module(settings.SESSION_ENGINE) engine = import_module(settings.SESSION_ENGINE)
# Create a fake request to store login details. # Create a fake request to store login details.

View File

@ -734,9 +734,8 @@ class TransactionTestCase(SimpleTestCase):
def _reset_sequences(self, db_name): def _reset_sequences(self, db_name):
conn = connections[db_name] conn = connections[db_name]
if conn.features.supports_sequence_reset: if conn.features.supports_sequence_reset:
sql_list = \ sql_list = conn.ops.sequence_reset_by_name_sql(
conn.ops.sequence_reset_by_name_sql(no_style(), no_style(), conn.introspection.sequence_list())
conn.introspection.sequence_list())
if sql_list: if sql_list:
with transaction.commit_on_success_unless_managed(using=db_name): with transaction.commit_on_success_unless_managed(using=db_name):
cursor = conn.cursor() cursor = conn.cursor()

View File

@ -152,13 +152,13 @@ else:
smart_unicode = smart_text smart_unicode = smart_text
force_unicode = force_text force_unicode = force_text
smart_str.__doc__ = """\ smart_str.__doc__ = """
Apply smart_text in Python 3 and smart_bytes in Python 2. Apply smart_text in Python 3 and smart_bytes in Python 2.
This is suitable for writing to sys.stdout (for instance). This is suitable for writing to sys.stdout (for instance).
""" """
force_str.__doc__ = """\ force_str.__doc__ = """
Apply force_text in Python 3 and force_bytes in Python 2. Apply force_text in Python 3 and force_bytes in Python 2.
""" """

View File

@ -272,7 +272,7 @@ class Rss201rev2Feed(RssFeed):
# Author information. # Author information.
if item["author_name"] and item["author_email"]: if item["author_name"] and item["author_email"]:
handler.addQuickElement("author", "%s (%s)" % \ handler.addQuickElement("author", "%s (%s)" %
(item['author_email'], item['author_name'])) (item['author_email'], item['author_name']))
elif item["author_email"]: elif item["author_email"]:
handler.addQuickElement("author", item["author_email"]) handler.addQuickElement("author", item["author_email"])

View File

@ -59,8 +59,8 @@ else:
attrname, rest, attrvalue = m.group(1, 2, 3) attrname, rest, attrvalue = m.group(1, 2, 3)
if not rest: if not rest:
attrvalue = None attrvalue = None
elif attrvalue[:1] == '\'' == attrvalue[-1:] or \ elif (attrvalue[:1] == '\'' == attrvalue[-1:] or
attrvalue[:1] == '"' == attrvalue[-1:]: attrvalue[:1] == '"' == attrvalue[-1:]):
attrvalue = attrvalue[1:-1] attrvalue = attrvalue[1:-1]
if attrvalue: if attrvalue:
attrvalue = self.unescape(attrvalue) attrvalue = self.unescape(attrvalue)
@ -72,8 +72,8 @@ else:
lineno, offset = self.getpos() lineno, offset = self.getpos()
if "\n" in self.__starttag_text: if "\n" in self.__starttag_text:
lineno = lineno + self.__starttag_text.count("\n") lineno = lineno + self.__starttag_text.count("\n")
offset = len(self.__starttag_text) \ offset = (len(self.__starttag_text)
- self.__starttag_text.rfind("\n") - self.__starttag_text.rfind("\n"))
else: else:
offset = offset + len(self.__starttag_text) offset = offset + len(self.__starttag_text)
self.error("junk characters in start tag: %r" self.error("junk characters in start tag: %r"

View File

@ -256,5 +256,5 @@ def is_safe_url(url, host=None):
if not url: if not url:
return False return False
url_info = urlparse(url) url_info = urlparse(url)
return (not url_info.netloc or url_info.netloc == host) and \ return ((not url_info.netloc or url_info.netloc == host) and
(not url_info.scheme or url_info.scheme in ['http', 'https']) (not url_info.scheme or url_info.scheme in ['http', 'https']))

View File

@ -158,7 +158,7 @@ class NoURLPatternsTests(TestCase):
resolver = RegexURLResolver(r'^$', self.urls) resolver = RegexURLResolver(r'^$', self.urls)
self.assertRaisesMessage(ImproperlyConfigured, self.assertRaisesMessage(ImproperlyConfigured,
"The included urlconf urlpatterns_reverse.no_urls "\ "The included urlconf urlpatterns_reverse.no_urls "
"doesn't have any patterns in it", getattr, resolver, 'url_patterns') "doesn't have any patterns in it", getattr, resolver, 'url_patterns')
class URLPatternReverse(TestCase): class URLPatternReverse(TestCase):