Ticket #14796: move_keyword_check.diff

django/core/management/commands/inspectdb.py

@@ -66 +66 @@
                 if ' ' in att_name:
                     att_name = att_name.replace(' ', '_')
                     comment_notes.append('Field renamed to remove spaces.')
+                    
                 if '-' in att_name:
                     att_name = att_name.replace('-', '_')
                     comment_notes.append('Field renamed to remove dashes.')
-                if keyword.iskeyword(att_name):
-                    att_name += '_field'
-                    comment_notes.append('Field renamed because it was a Python reserved word.')
+                    
                 if column_name != att_name:
                     comment_notes.append('Field name made lowercase.')
 
@@ -97 +96 @@
                             extra_params['unique'] = True
 
                     field_type += '('
+                    
+                if keyword.iskeyword(att_name):
+                    att_name += '_field'
+                    comment_notes.append('Field renamed because it was a Python reserved word.')
 
                 # Don't output 'id = meta.AutoField(primary_key=True)', because
                 # that's assumed if it doesn't exist.