Commit fb590bfa authored by Jannis Leidel's avatar Jannis Leidel
Browse files

Replaced `has_key()` calls with `in` to ease Python 3 port. Thanks, Martin von Löwis. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16740 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 7deb25b8

django/contrib/databrowse/plugins/calendars.py

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ class CalendarPlugin(DatabrowsePlugin): 
        if url is None:

            return self.homepage_view(request)

        url_bits = url.split('/')

        if self.fields.has_key(url_bits[0]):

        if url_bits[0] in self.fields:

            return self.calendar_view(request, self.fields[url_bits[0]], *url_bits[1:])



        raise http.Http404('The requested page does not exist.')

django/contrib/databrowse/plugins/fieldchoices.py

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ class FieldChoicePlugin(DatabrowsePlugin): 
        if url is None:

            return self.homepage_view(request)

        url_bits = url.split('/', 1)

        if self.fields.has_key(url_bits[0]):

        if url_bits[0] in self.fields:

            return self.field_view(request, self.fields[url_bits[0]], *url_bits[1:])



        raise http.Http404('The requested page does not exist.')

django/contrib/sessions/backends/base.py

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ class SessionBase(object): 
        self.modified = True



    def has_key(self, key):

        return self._session.has_key(key)

        return key in self._session



    def values(self):

        return self._session.values()

django/contrib/sessions/backends/cache.py

+1 −3
Original line number Diff line number Diff line
@@ -43,9 +43,7 @@ class SessionStore(SessionBase): 
            raise CreateError



    def exists(self, session_key):

        if self._cache.has_key(session_key):

            return True

        return False

        return session_key in self._cache



    def delete(self, session_key=None):

        if session_key is None:

django/contrib/sessions/backends/file.py

+1 −3
Original line number Diff line number Diff line
@@ -131,9 +131,7 @@ class SessionStore(SessionBase): 
            pass



    def exists(self, session_key):

        if os.path.exists(self._key_to_file(session_key)):

            return True

        return False

        return os.path.exists(self._key_to_file(session_key))



    def delete(self, session_key=None):

        if session_key is None: