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

PEP-8, it's a thing!

fix_request_path_info
Jonas Obrist 2011-05-19 06:05:49 -07:00
parent ba2cb60c9d
commit 6f8e31222d
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
polymorphic/query.py
View File

@ -225,7 +225,8 @@ class PolymorphicQuerySet(QuerySet):
# disabled => work just like a normal queryset # disabled => work just like a normal queryset
if self.polymorphic_disabled: if self.polymorphic_disabled:
for o in base_iter: yield o for o in base_iter:
yield o
raise StopIteration raise StopIteration
while True: while True:
@ -234,7 +235,7 @@ class PolymorphicQuerySet(QuerySet):
for i in range(Polymorphic_QuerySet_objects_per_request): for i in range(Polymorphic_QuerySet_objects_per_request):
try: try:
o=base_iter.next() o = base_iter.next()
base_result_objects.append(o) base_result_objects.append(o)
except StopIteration: except StopIteration:
reached_end = True reached_end = True
@ -245,7 +246,8 @@ class PolymorphicQuerySet(QuerySet):
for o in real_results: for o in real_results:
yield o yield o
if reached_end: raise StopIteration if reached_end:
raise StopIteration
def __repr__(self, *args, **kwargs): def __repr__(self, *args, **kwargs):
if self.model.polymorphic_query_multiline_output: if self.model.polymorphic_query_multiline_output:
@ -261,10 +263,11 @@ class PolymorphicQuerySet(QuerySet):
def get_real_instances(self, base_result_objects=None): def get_real_instances(self, base_result_objects=None):
"same as _get_real_instances, but make sure that __repr__ for ShowField... creates correct output" "same as _get_real_instances, but make sure that __repr__ for ShowField... creates correct output"
if not base_result_objects: base_result_objects=self if not base_result_objects:
base_result_objects = self
olist = self._get_real_instances(base_result_objects) olist = self._get_real_instances(base_result_objects)
if not self.model.polymorphic_query_multiline_output: if not self.model.polymorphic_query_multiline_output:
return olist return olist
clist=PolymorphicQuerySet._p_list_class(olist) clist = PolymorphicQuerySet._p_list_class(olist)
return clist return clist