Django

Code

Changeset 7454

Show
Ignore:
Timestamp:
04/24/08 07:15:46 (3 months ago)
Author:
mtredinnick
Message:

queryset-refactor: A few bits of code cleanup.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/queryset-refactor/django/db/models/sql/query.py

    r7447 r7454  
    358358        """ 
    359359        qn = self.quote_name_unless_alias 
    360         result = ['(%s) AS %s' % (col, alias) for alias, col in self.extra_select.items()] 
     360        result = ['(%s) AS %s' % (col, alias) for alias, col in self.extra_select.iteritems()] 
    361361        aliases = self.extra_select.keys() 
    362362        if self.select: 
    …… 
    634634 
    635635        # 2. Rename the alias in the internal table/alias datastructures. 
    636         for old_alias, new_alias in change_map.items(): 
     636        for old_alias, new_alias in change_map.iteritems(): 
    637637            alias_data = list(self.alias_map[old_alias]) 
    638638            alias_data[RHS_ALIAS] = new_alias 
    …… 
    658658 
    659659        # 3. Update any joins that refer to the old alias. 
    660         for alias, data in self.alias_map.items(): 
     660        for alias, data in self.alias_map.iteritems(): 
    661661            lhs = data[LHS_ALIAS] 
    662662            if lhs in change_map: 
    …… 
    707707        count. 
    708708        """ 
    709         return len([1 for count in self.alias_refcount.values() if count]) 
     709        return len([1 for count in self.alias_refcount.itervalues() if count]) 
    710710 
    711711    def join(self, connection, always_create=False, exclusions=(), 

  • django/branches/queryset-refactor/django/db/models/sql/subqueries.py

    r7439 r7454  
    296296        into the query, for example. 
    297297        """ 
    298         # keys() and values() return items in the same order, providing the 
    299         # dictionary hasn't changed between calls. So the dual iteration here 
    300         # works as intended. 
    301298        placeholders, values = [], [] 
    302299        for field, val in insert_values: