Python 3: Replace "dict.has_key(key)" with "key in dict"

8 files changed, 14 insertions, 14 deletions

diff --git a/paste/auth/cookie.py b/paste/auth/cookie.py
index 2c60a05..3593804 100644
--- a/paste/auth/cookie.py
+++ b/paste/auth/cookie.py
@@ -258,7 +258,7 @@ class AuthCookieHandler(object):
             raise AssertionError("AuthCookie already installed!")
         scanlist = self.environ_class(self, self.scanlist)
         jar = get_cookies(environ)
-        if jar.has_key(self.cookie_name):
+        if self.cookie_name in jar:
             content = self.signer.auth(jar[self.cookie_name].value)
             if content:
                 for pair in content.split(";"):
diff --git a/paste/errordocument.py b/paste/errordocument.py
index 1289add..62224b3 100644
--- a/paste/errordocument.py
+++ b/paste/errordocument.py
@@ -46,7 +46,7 @@ def forward(app, codes):
                 '%s is not valid'%repr(code))
 
     def error_codes_mapper(code, message, environ, global_conf, codes):
-        if codes.has_key(code):
+        if code in codes:
             return codes[code]
         else:
             return None
diff --git a/paste/exceptions/collector.py b/paste/exceptions/collector.py
index 4f6d4c6..d6a30db 100644
--- a/paste/exceptions/collector.py
+++ b/paste/exceptions/collector.py
@@ -281,10 +281,10 @@ class ExceptionCollector(object):
         data['tbid'] = id(tb)
 
         # Output a traceback supplement, if any.
-        if locals.has_key('__traceback_supplement__'):
+        if '__traceback_supplement__' in locals:
             # Use the supplement defined in the function.
             tbs = locals['__traceback_supplement__']
-        elif globals.has_key('__traceback_supplement__'):
+        elif '__traceback_supplement__' in globals:
             # Use the supplement defined in the module.
             # This is used by Scripts (Python).
             tbs = globals['__traceback_supplement__']
diff --git a/paste/lint.py b/paste/lint.py
index 03b4a60..5505663 100644
--- a/paste/lint.py
+++ b/paste/lint.py
@@ -339,7 +339,7 @@ def check_environ(environ):
             "Invalid CONTENT_LENGTH: %r" % environ['CONTENT_LENGTH'])
 
     if not environ.get('SCRIPT_NAME'):
-        assert environ.has_key('PATH_INFO'), (
+        assert 'PATH_INFO' in environ, (
             "One of SCRIPT_NAME or PATH_INFO are required (PATH_INFO "
             "should at least be '/' if SCRIPT_NAME is empty)")
     assert environ.get('SCRIPT_NAME') != '/', (
diff --git a/paste/request.py b/paste/request.py
index 5649b7b..71eca30 100644
--- a/paste/request.py
+++ b/paste/request.py
@@ -47,7 +47,7 @@ def get_cookies(environ):
 
     """
     header = environ.get('HTTP_COOKIE', '')
-    if environ.has_key('paste.cookies'):
+    if 'paste.cookies' in environ:
         cookies, check_header = environ['paste.cookies']
         if check_header == header:
             return cookies
@@ -70,7 +70,7 @@ def get_cookie_dict(environ):
     header = environ.get('HTTP_COOKIE')
     if not header:
         return {}
-    if environ.has_key('paste.cookies.dict'):
+    if 'paste.cookies.dict' in environ:
         cookies, check_header = environ['paste.cookies.dict']
         if check_header == header:
             return cookies
diff --git a/paste/session.py b/paste/session.py
index 7558533..5f654f2 100644
--- a/paste/session.py
+++ b/paste/session.py
@@ -105,7 +105,7 @@ class SessionFactory(object):
             return self.session.data()
         cookies = request.get_cookies(self.environ)
         session = None
-        if cookies.has_key(self.cookie_name):
+        if self.cookie_name in cookies:
             self.sid = cookies[self.cookie_name].value
             try:
                 session = self.session_class(self.sid, create=False,
diff --git a/paste/urlparser.py b/paste/urlparser.py
index 4174bf7..e12e63f 100644
--- a/paste/urlparser.py
+++ b/paste/urlparser.py
@@ -298,7 +298,7 @@ class URLParser(object):
         ``environ`` and ``filename``, and returns a WSGI application.
         """
         d = cls.global_constructors
-        assert not d.has_key(extension), (
+        assert extension not in d, (
             "A constructor already exists for the extension %r (%r) "
             "when attemption to register constructor %r"
             % (extension, d[extension], constructor))
@@ -362,7 +362,7 @@ def load_module(environ, filename):
                                  environ['wsgi.errors'])
 
 def load_module_from_name(environ, filename, module_name, errors):
-    if sys.modules.has_key(module_name):
+    if module_name in sys.modules:
         return sys.modules[module_name]
     init_filename = os.path.join(os.path.dirname(filename), '__init__.py')
     if not os.path.exists(init_filename):
@@ -376,7 +376,7 @@ def load_module_from_name(environ, filename, module_name, errors):
         f.write('#\n')
         f.close()
     fp = None
-    if sys.modules.has_key(module_name):
+    if module_name in sys.modules:
         return sys.modules[module_name]
     if '.' in module_name:
         parent_name = '.'.join(module_name.split('.')[:-1])
diff --git a/tests/test_registry.py b/tests/test_registry.py
index d0dc8ac..7af953f 100644
--- a/tests/test_registry.py
+++ b/tests/test_registry.py
@@ -37,7 +37,7 @@ class RegistryUsingApp(object):
         self.raise_exc = raise_exc
     
     def __call__(self, environ, start_response):
-        if environ.has_key('paste.registry'):
+        if 'paste.registry' in environ:
             environ['paste.registry'].register(self.var, self.value)
         if self.raise_exc:
             raise self.raise_exc
@@ -52,7 +52,7 @@ class RegistryUsingIteratorApp(object):
         self.value = value
     
     def __call__(self, environ, start_response):
-        if environ.has_key('paste.registry'):
+        if 'paste.registry' in environ:
             environ['paste.registry'].register(self.var, self.value)
         status = '200 OK'
         response_headers = [('Content-type','text/plain')]
@@ -67,7 +67,7 @@ class RegistryMiddleMan(object):
         self.depth = depth
     
     def __call__(self, environ, start_response):
-        if environ.has_key('paste.registry'):
+        if 'paste.registry' in environ:
             environ['paste.registry'].register(self.var, self.value)
         app_response = ['\nInserted by middleware!\nInsertValue at depth \
             %s is %s' % (self.depth, str(regobj))]