diff options
| -rw-r--r-- | dsextras.py | 4 | ||||
| -rw-r--r-- | pygtk.py | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/dsextras.py b/dsextras.py index 9fc79c1..2f8d89a 100644 --- a/dsextras.py +++ b/dsextras.py @@ -66,7 +66,7 @@ def list_files(dir): that matches *.glade. It also looks up the full path""" if dir.find(os.sep) != -1: parts = dir.split(os.sep) - dir = string.join(parts[:-1], os.sep) + dir = os.sep.join(parts[:-1]) pattern = parts[-1] else: pattern = dir @@ -421,7 +421,7 @@ class TemplateExtension(PkgConfigExtension): if load_types: del kwargs['load_types'] - if kwargs.has_key('output'): + if 'output' in kwargs: kwargs['name'] = kwargs['output'] del kwargs['output'] @@ -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 ... |