mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-26 07:06:08 +00:00
Code Issues 32 Releases Wiki Activity

Revert "Fixed #16211 -- Added comparison and negation ops to F() expressions"

Browse Source 
This reverts commit 28abf5f0eb.

Conflicts:

	docs/releases/1.5.txt
This commit is contained in:
Anssi Kääriäinen
2012-10-03 18:21:39 +03:00
parent 7f4dbdc036
commit a8b1861fc4
7 changed files with 22 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
django/utils/tree.py
View File

@@ -88,12 +88,8 @@ class Node(object):
Otherwise, the whole tree is pushed down one level and a new root
connector is created, connecting the existing tree and the new node.
"""
# Using for loop with 'is' instead of 'if node in children' so node
# __eq__ method doesn't get called. The __eq__ method can be overriden
# by subtypes, for example the F-expression.
for child in self.children:
if node is child and conn_type == self.connector:
return
if node in self.children and conn_type == self.connector:
return
if len(self.children) < 2:
self.connector = conn_type
if self.connector == conn_type: