Django

Code

Changeset 1420

Show
Ignore:
Timestamp:
11/24/05 20:26:08 (3 years ago)
Author:
adrian
Message:

new-admin and trunk: Normalized spacing differences in bin/validate.py between trunk and new-admin

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/new-admin/django/bin/validate.py

    r982 r1420  
    1515        if isinstance(f, meta.ManyToManyField): 
    1616            assert isinstance(f.rel, meta.ManyToMany), \ 
    17                   "ManyToManyField %s should have 'rel' set to a ManyToMany instance." % f.name 
     17                "ManyToManyField %s should have 'rel' set to a ManyToMany instance." % f.name 
    1818    # Inline related objects. 
    1919    for related in opts.get_followed_related_objects(): 
    2020        assert len([f for f in related.opts.fields if f.core]) > 0, \ 
    21                "At least one field in %s should have core=True, because it's being edited inline by %s." % \ 
    22                (related.opts.object_name, opts.object_name) 
     21            "At least one field in %s should have core=True, because it's being edited inline by %s." % \ 
     22            (related.opts.object_name, opts.object_name) 
    2323    # All related objects. 
    2424    related_apps_seen = [] 
     
    2626        if related.opts in related_apps_seen: 
    2727            assert related.field.rel.related_name is not None, \ 
    28                 "Relationship in field %s.%s needs to set 'related_name' because more than one" \ 
    29                 " %s object is referenced in %s." % \ 
    30                 (related.opts.object_name, related.field.name, opts.object_name, rel_opts.object_name) 
     28                "Relationship in field %s.%s needs to set 'related_name' because more than one" \ 
     29                " %s object is referenced in %s." % \ 
     30                (related.opts.object_name, related.field.name, opts.object_name, rel_opts.object_name) 
    3131        related_apps_seen.append(related.opts) 
    3232    # Etc. 
     
    3434        assert opts.admin.ordering or opts.ordering, \ 
    3535            "%s needs to set 'ordering' on either its 'admin' or its model," \ 
    36             "because it has 'admin' set." % \ 
    37             opts.object_name 
     36            " because it has 'admin' set." % opts.object_name 
    3837 
    3938if __name__ == "__main__": 
  • django/trunk/django/bin/validate.py

    r3 r1420  
    1414    for f in opts.fields: 
    1515        if isinstance(f, meta.ManyToManyField): 
    16             assert isinstance(f.rel, meta.ManyToMany), "ManyToManyField %s should have 'rel' set to a ManyToMany instance." % f.name 
     16            assert isinstance(f.rel, meta.ManyToMany), \ 
     17                "ManyToManyField %s should have 'rel' set to a ManyToMany instance." % f.name 
    1718    # Inline related objects. 
    1819    for rel_opts, rel_field in opts.get_inline_related_objects(): 
    19         assert len([f for f in rel_opts.fields if f.core]) > 0, "At least one field in %s should have core=True, because it's being edited inline by %s." % (rel_opts.object_name, opts.object_name) 
     20        assert len([f for f in rel_opts.fields if f.core]) > 0, \ 
     21            "At least one field in %s should have core=True, because it's being edited inline by %s." % \ 
     22            (rel_opts.object_name, opts.object_name) 
    2023    # All related objects. 
    2124    related_apps_seen = [] 
    2225    for rel_opts, rel_field in opts.get_all_related_objects(): 
    2326        if rel_opts in related_apps_seen: 
    24             assert rel_field.rel.related_name is not None, "Relationship in field %s.%s needs to set 'related_name' because more than one %s object is referenced in %s." % (rel_opts.object_name, rel_field.name, opts.object_name, rel_opts.object_name) 
     27            assert rel_field.rel.related_name is not None, \ 
     28                "Relationship in field %s.%s needs to set 'related_name' because more than one" \ 
     29                " %s object is referenced in %s." % \ 
     30                (rel_opts.object_name, rel_field.name, opts.object_name, rel_opts.object_name) 
    2531        related_apps_seen.append(rel_opts) 
    2632    # Etc. 
    2733    if opts.admin is not None: 
    28         assert opts.admin.ordering or opts.ordering, "%s needs to set 'ordering' on either its 'admin' or its model, because it has 'admin' set." % opts.object_name 
     34        assert opts.admin.ordering or opts.ordering, \ 
     35            "%s needs to set 'ordering' on either its 'admin' or its model," \ 
     36            " because it has 'admin' set." % opts.object_name 
    2937 
    3038if __name__ == "__main__":