From c9922d89874f7c05ca6ff6e8d3690a897562464b Mon Sep 17 00:00:00 2001 From: "German M. Bravo" Date: Sat, 26 Nov 2011 00:07:23 -0600 Subject: [PATCH] PEP 8 cleaning --- polymorphic/base.py | 14 ++++++++------ polymorphic/polymorphic_model.py | 1 - polymorphic/query.py | 1 - 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/polymorphic/base.py b/polymorphic/base.py index 8436064..d5824e8 100644 --- a/polymorphic/base.py +++ b/polymorphic/base.py @@ -127,7 +127,7 @@ class PolymorphicModelBase(ModelBase): if not isinstance(item, models.Manager): continue mgr_list.append((item.creation_counter, key, item)) # if there are user defined managers, use first one as _default_manager - if mgr_list: # + if mgr_list: _, manager_name, manager = sorted(mgr_list)[0] #sys.stderr.write( '\n# first user defined manager for model "{model}":\n# "{mgrname}": {mgr}\n# manager model: {mgrmodel}\n\n' # .format( model=model_name, mgrname=manager_name, mgr=manager, mgrmodel=manager.model ) ) @@ -150,9 +150,11 @@ class PolymorphicModelBase(ModelBase): and model_name == 'PolymorphicModel' and getattr(meta, 'app_label', None) is None ) - if do_app_label_workaround: meta.app_label = 'poly_dummy_app_label' + if do_app_label_workaround: + meta.app_label = 'poly_dummy_app_label' new_class = super(PolymorphicModelBase, self).__new__(self, model_name, bases, attrs) - if do_app_label_workaround: del(meta.app_label) + if do_app_label_workaround: + del(meta.app_label) return new_class def validate_model_fields(self): @@ -177,7 +179,6 @@ class PolymorphicModelBase(ModelBase): raise AssertionError(e) return manager - # hack: a small patch to Django would be a better solution. # Django's management command 'dumpdata' relies on non-polymorphic # behaviour of the _default_manager. Therefore, we catch any access to _default_manager @@ -187,7 +188,9 @@ class PolymorphicModelBase(ModelBase): # for all supported Django versions. # TODO: investigate Django how this can be avoided _dumpdata_command_running = False - if len(sys.argv)>1: _dumpdata_command_running = ( sys.argv[1] == 'dumpdata' ) + if len(sys.argv) > 1: + _dumpdata_command_running = (sys.argv[1] == 'dumpdata') + def __getattribute__(self, name): if name=='_default_manager': if self._dumpdata_command_running: @@ -198,4 +201,3 @@ class PolymorphicModelBase(ModelBase): #if caller_mod_name == 'django.core.management.commands.dumpdata': return super(PolymorphicModelBase, self).__getattribute__(name) - diff --git a/polymorphic/polymorphic_model.py b/polymorphic/polymorphic_model.py index f69e2d2..4eec5bc 100644 --- a/polymorphic/polymorphic_model.py +++ b/polymorphic/polymorphic_model.py @@ -183,4 +183,3 @@ class PolymorphicModel(models.Model): add_all_super_models(self.__class__,result) add_all_sub_models(self.__class__,result) return result - diff --git a/polymorphic/query.py b/polymorphic/query.py index e544ab5..504ab06 100644 --- a/polymorphic/query.py +++ b/polymorphic/query.py @@ -269,4 +269,3 @@ class PolymorphicQuerySet(QuerySet): return olist clist = PolymorphicQuerySet._p_list_class(olist) return clist -