Django

Code

Changeset 6098

Show
Ignore:
Timestamp:
09/11/07 09:04:40 (1 year ago)
Author:
russellm
Message:

Refs #5138 -- Refactored implementation of contains in HttpRequest introduced in [6097] after a suggestion from Malcolm. Applied a similar refactor for MergeDict? and Context which had comparable behavior.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/trunk/django/http/__init__.py

    r6097 r6098  
    3939        raise KeyError, "%s not found in either POST or GET" % key 
    4040 
    41     def __contains__(self, key): 
     41    def has_key(self, key): 
    4242        return key in self.GET or key in self.POST 
    4343 
    44     def has_key(self, key): 
    45         return key in self 
     44    __contains__ = has_key 
    4645         
    4746    def get_full_path(self): 
  • django/trunk/django/template/context.py

    r5091 r6098  
    5050        return False 
    5151 
    52     def __contains__(self, key): 
    53         return self.has_key(key) 
     52    __contains__ = has_key 
    5453 
    5554    def get(self, key, otherwise=None): 
  • django/trunk/django/utils/datastructures.py

    r5874 r6098  
    1515        raise KeyError 
    1616 
    17     def __contains__(self, key): 
    18         return self.has_key(key) 
    19  
    2017    def __copy__(self): 
    2118        return self.__class__(*self.dicts) 
     
    4643                return True 
    4744        return False 
     45     
     46    __contains__ = has_key 
    4847 
    4948    def copy(self):