summaryrefslogtreecommitdiffstats
path: root/pygtk.py
diff options
context:
space:
mode:
authorJohn Ehresman <jpe@wingware.com>2010-04-13 12:15:35 -0400
committerJohn Ehresman <jpe@wingware.com>2010-04-15 12:16:48 -0400
commitef1eb49d5e29630d998517c5d1e93dde03a004ef (patch)
treee9776ca4793c0fb76a79deffc6d5c08dc12ee158 /pygtk.py
parent8cd850a5d2526b83bf3862ec86c430f718947294 (diff)
downloadpygobject-ef1eb49d5e29630d998517c5d1e93dde03a004ef.tar.gz
pygobject-ef1eb49d5e29630d998517c5d1e93dde03a004ef.tar.xz
pygobject-ef1eb49d5e29630d998517c5d1e93dde03a004ef.zip
Run under both Python 2.x and 3.x
Diffstat (limited to 'pygtk.py')
-rw-r--r--pygtk.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/pygtk.py b/pygtk.py
index e061b88..98c286e 100644
--- a/pygtk.py
+++ b/pygtk.py
@@ -57,8 +57,7 @@ def _get_available_versions():
# skip empty directories
if not os.listdir(pathname):
continue
-
- if not versions.has_key(filename[-3:]):
+ if filename[-3:] not in versions:
versions[filename[-3:]] = pathname
return versions
@@ -77,11 +76,11 @@ def require(version):
"a different version of gtk was already required"
return
- assert not sys.modules.has_key('gtk'), \
+ assert 'gtk' not in sys.modules, \
"pygtk.require() must be called before importing gtk"
versions = _get_available_versions()
- assert versions.has_key(version), \
+ assert version in versions, \
"required version '%s' not found on system" % version
# remove any pygtk dirs first ...