diff options
author | Marc Abramowitz <marc@marc-abramowitz.com> | 2015-05-11 07:54:36 -0700 |
---|---|---|
committer | Marc Abramowitz <marc@marc-abramowitz.com> | 2015-05-11 07:54:36 -0700 |
commit | 77d73add74d63d04d49717c8ec01d8321c66e0cb (patch) | |
tree | 30743fa835e54d8fbd97bd910724c161d7085161 /paste | |
parent | d227ba60a8d486ab4a56afc5d0a49775f47a5651 (diff) | |
parent | 280aaa026a93d9fe9a4e039b9d2b686838e21733 (diff) | |
download | paste-git-77d73add74d63d04d49717c8ec01d8321c66e0cb.tar.gz |
Merged in aodag/paste-py3/fix-has_key (pull request #25)
replace ``has_key`` method to ``in`` operator #9
Diffstat (limited to 'paste')
-rw-r--r-- | paste/reloader.py | 2 | ||||
-rw-r--r-- | paste/util/classinstance.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/paste/reloader.py b/paste/reloader.py index 15c4d1c..c9d7c14 100644 --- a/paste/reloader.py +++ b/paste/reloader.py @@ -118,7 +118,7 @@ class Monitor(object): elif filename.endswith('$py.class') and \ os.path.exists(filename[:-9] + '.py'): mtime = max(os.stat(filename[:-9] + '.py').st_mtime, mtime) - if not self.module_mtimes.has_key(filename): + if filename not in self.module_mtimes: self.module_mtimes[filename] = mtime elif self.module_mtimes[filename] < mtime: print("%s changed; reloading..." % filename, file=sys.stderr) diff --git a/paste/util/classinstance.py b/paste/util/classinstance.py index ac2be3e..6436a44 100644 --- a/paste/util/classinstance.py +++ b/paste/util/classinstance.py @@ -24,7 +24,7 @@ class _methodwrapper(object): self.type = type def __call__(self, *args, **kw): - assert not kw.has_key('self') and not kw.has_key('cls'), ( + assert 'self' not in kw and 'cls' not in kw, ( "You cannot use 'self' or 'cls' arguments to a " "classinstancemethod") return self.func(*((self.obj, self.type) + args), **kw) |