diff options
| author | Loic Bistuer <loic.bistuer@sixmedia.com> | 2013-12-09 00:20:06 +0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-12-10 15:12:48 -0500 |
| commit | a2814846ca006b4fbf3a893ec52cd9d444b3a3eb (patch) | |
| tree | 780498814e830e2b8ee6ac435575afdc2e8e63f6 /django/db | |
| parent | 0873200e7f61315ad375061a3dc6d37b514ff985 (diff) | |
Fixed E124 pep8 warnings.
Diffstat (limited to 'django/db')
| -rw-r--r-- | django/db/backends/__init__.py | 3 | ||||
| -rw-r--r-- | django/db/backends/mysql/base.py | 8 | ||||
| -rw-r--r-- | django/db/backends/postgresql_psycopg2/base.py | 3 | ||||
| -rw-r--r-- | django/db/migrations/optimizer.py | 114 | ||||
| -rw-r--r-- | django/db/models/fields/__init__.py | 3 | ||||
| -rw-r--r-- | django/db/models/fields/related.py | 3 |
6 files changed, 74 insertions, 60 deletions
diff --git a/django/db/backends/__init__.py b/django/db/backends/__init__.py index a2a1757ad3..3faaeffb21 100644 --- a/django/db/backends/__init__.py +++ b/django/db/backends/__init__.py @@ -1215,8 +1215,7 @@ class BaseDatabaseOperations(object): # Structure returned by the DB-API cursor.description interface (PEP 249) FieldInfo = namedtuple('FieldInfo', - 'name type_code display_size internal_size precision scale null_ok' -) + 'name type_code display_size internal_size precision scale null_ok') class BaseDatabaseIntrospection(object): diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py index b38d00c84a..e7932dd800 100644 --- a/django/db/backends/mysql/base.py +++ b/django/db/backends/mysql/base.py @@ -332,13 +332,15 @@ class DatabaseOperations(BaseDatabaseOperations): # Truncate already resets the AUTO_INCREMENT field from # MySQL version 5.0.13 onwards. Refs #16961. if self.connection.mysql_version < (5, 0, 13): - return ["%s %s %s %s %s;" % - (style.SQL_KEYWORD('ALTER'), + return [ + "%s %s %s %s %s;" % ( + style.SQL_KEYWORD('ALTER'), style.SQL_KEYWORD('TABLE'), style.SQL_TABLE(self.quote_name(sequence['table'])), style.SQL_KEYWORD('AUTO_INCREMENT'), style.SQL_FIELD('= 1'), - ) for sequence in sequences] + ) for sequence in sequences + ] else: return [] diff --git a/django/db/backends/postgresql_psycopg2/base.py b/django/db/backends/postgresql_psycopg2/base.py index cb23c33a5c..91e16a1b76 100644 --- a/django/db/backends/postgresql_psycopg2/base.py +++ b/django/db/backends/postgresql_psycopg2/base.py @@ -168,7 +168,8 @@ class DatabaseWrapper(BaseDatabaseWrapper): # notification. If we don't set self.connection to None, the error # will occur a every request. self.connection = None - logger.warning('psycopg2 error while closing the connection.', + logger.warning( + 'psycopg2 error while closing the connection.', exc_info=sys.exc_info() ) raise diff --git a/django/db/migrations/optimizer.py b/django/db/migrations/optimizer.py index 435ac6766e..3e9dc42aa3 100644 --- a/django/db/migrations/optimizer.py +++ b/django/db/migrations/optimizer.py @@ -176,12 +176,14 @@ class MigrationOptimizer(object): Folds a model rename into its create """ if operation.name.lower() == other.old_name.lower(): - return [migrations.CreateModel( - other.new_name, - fields=operation.fields, - options=operation.options, - bases=operation.bases, - )] + return [ + migrations.CreateModel( + other.new_name, + fields=operation.fields, + options=operation.options, + bases=operation.bases, + ) + ] def reduce_model_rename_self(self, operation, other): """ @@ -197,57 +199,67 @@ class MigrationOptimizer(object): def reduce_create_model_add_field(self, operation, other): if operation.name.lower() == other.model_name.lower(): - return [migrations.CreateModel( - operation.name, - fields=operation.fields + [(other.name, other.field)], - options=operation.options, - bases=operation.bases, - )] + return [ + migrations.CreateModel( + operation.name, + fields=operation.fields + [(other.name, other.field)], + options=operation.options, + bases=operation.bases, + ) + ] def reduce_create_model_alter_field(self, operation, other): if operation.name.lower() == other.model_name.lower(): - return [migrations.CreateModel( - operation.name, - fields=[ - (n, other.field if n == other.name else v) - for n, v in operation.fields - ], - options=operation.options, - bases=operation.bases, - )] + return [ + migrations.CreateModel( + operation.name, + fields=[ + (n, other.field if n == other.name else v) + for n, v in operation.fields + ], + options=operation.options, + bases=operation.bases, + ) + ] def reduce_create_model_rename_field(self, operation, other): if operation.name.lower() == other.model_name.lower(): - return [migrations.CreateModel( - operation.name, - fields=[ - (other.new_name if n == other.old_name else n, v) - for n, v in operation.fields - ], - options=operation.options, - bases=operation.bases, - )] + return [ + migrations.CreateModel( + operation.name, + fields=[ + (other.new_name if n == other.old_name else n, v) + for n, v in operation.fields + ], + options=operation.options, + bases=operation.bases, + ) + ] def reduce_create_model_remove_field(self, operation, other): if operation.name.lower() == other.model_name.lower(): - return [migrations.CreateModel( - operation.name, - fields=[ - (n, v) - for n, v in operation.fields - if n.lower() != other.name.lower() - ], - options=operation.options, - bases=operation.bases, - )] + return [ + migrations.CreateModel( + operation.name, + fields=[ + (n, v) + for n, v in operation.fields + if n.lower() != other.name.lower() + ], + options=operation.options, + bases=operation.bases, + ) + ] def reduce_add_field_alter_field(self, operation, other): if operation.model_name.lower() == other.model_name.lower() and operation.name.lower() == other.name.lower(): - return [migrations.AddField( - model_name=operation.model_name, - name=operation.name, - field=other.field, - )] + return [ + migrations.AddField( + model_name=operation.model_name, + name=operation.name, + field=other.field, + ) + ] def reduce_add_field_delete_field(self, operation, other): if operation.model_name.lower() == other.model_name.lower() and operation.name.lower() == other.name.lower(): @@ -259,11 +271,13 @@ class MigrationOptimizer(object): def reduce_add_field_rename_field(self, operation, other): if operation.model_name.lower() == other.model_name.lower() and operation.name.lower() == other.old_name.lower(): - return [migrations.AddField( - model_name=operation.model_name, - name=other.new_name, - field=operation.field, - )] + return [ + migrations.AddField( + model_name=operation.model_name, + name=other.new_name, + field=operation.field, + ) + ] def reduce_alter_field_rename_field(self, operation, other): if operation.model_name.lower() == other.model_name.lower() and operation.name.lower() == other.old_name.lower(): diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index 826471d9ed..fbdf67d4c5 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -1686,8 +1686,7 @@ class BinaryField(Field): return default def get_db_prep_value(self, value, connection, prepared=False): - value = super(BinaryField, self - ).get_db_prep_value(value, connection, prepared) + value = super(BinaryField, self).get_db_prep_value(value, connection, prepared) if value is not None: return connection.Database.Binary(value) return value diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index be796f2af1..5bfb1022a8 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -963,8 +963,7 @@ class OneToOneRel(ManyToOneRel): parent_link=False, on_delete=None, related_query_name=None): super(OneToOneRel, self).__init__(field, to, field_name, related_name=related_name, limit_choices_to=limit_choices_to, - parent_link=parent_link, on_delete=on_delete, related_query_name=related_query_name, - ) + parent_link=parent_link, on_delete=on_delete, related_query_name=related_query_name) self.multiple = False |
