summaryrefslogtreecommitdiffstats
path: root/dsextras.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 /dsextras.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 'dsextras.py')
-rw-r--r--dsextras.py4
1 files changed, 2 insertions, 2 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']