Briq
/
django-polymorphic
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PEP 8 cleaning

fix_request_path_info
German M. Bravo 2011-11-26 00:07:23 -06:00 committed by Christopher Glass
parent bb06d6d12b
commit c9922d8987
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
polymorphic/base.py
View File

@ -127,7 +127,7 @@ class PolymorphicModelBase(ModelBase):
if not isinstance(item, models.Manager): continue if not isinstance(item, models.Manager): continue
mgr_list.append((item.creation_counter, key, item)) mgr_list.append((item.creation_counter, key, item))
# if there are user defined managers, use first one as _default_manager # 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] _, 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' #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 ) ) # .format( model=model_name, mgrname=manager_name, mgr=manager, mgrmodel=manager.model ) )
@ -150,9 +150,11 @@ class PolymorphicModelBase(ModelBase):
and model_name == 'PolymorphicModel' and model_name == 'PolymorphicModel'
and getattr(meta, 'app_label', None) is None ) 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) 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 return new_class
def validate_model_fields(self): def validate_model_fields(self):
@ -177,7 +179,6 @@ class PolymorphicModelBase(ModelBase):
raise AssertionError(e) raise AssertionError(e)
return manager return manager
# hack: a small patch to Django would be a better solution. # hack: a small patch to Django would be a better solution.
# Django's management command 'dumpdata' relies on non-polymorphic # Django's management command 'dumpdata' relies on non-polymorphic
# behaviour of the _default_manager. Therefore, we catch any access to _default_manager # 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. # for all supported Django versions.
# TODO: investigate Django how this can be avoided # TODO: investigate Django how this can be avoided
_dumpdata_command_running = False _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): def __getattribute__(self, name):
if name=='_default_manager': if name=='_default_manager':
if self._dumpdata_command_running: if self._dumpdata_command_running:
@ -198,4 +201,3 @@ class PolymorphicModelBase(ModelBase):
#if caller_mod_name == 'django.core.management.commands.dumpdata': #if caller_mod_name == 'django.core.management.commands.dumpdata':
return super(PolymorphicModelBase, self).__getattribute__(name) return super(PolymorphicModelBase, self).__getattribute__(name)

1
polymorphic/polymorphic_model.py
View File

@ -183,4 +183,3 @@ class PolymorphicModel(models.Model):
add_all_super_models(self.__class__,result) add_all_super_models(self.__class__,result)
add_all_sub_models(self.__class__,result) add_all_sub_models(self.__class__,result)
return result return result

1
polymorphic/query.py
View File

@ -269,4 +269,3 @@ class PolymorphicQuerySet(QuerySet):
return olist return olist
clist = PolymorphicQuerySet._p_list_class(olist) clist = PolymorphicQuerySet._p_list_class(olist)
return clist return clist