summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Ehresman <jpe@wingware.com>2010-04-15 18:33:45 -0400
committerJohn Ehresman <jpe@wingware.com>2010-04-15 18:33:45 -0400
commit25c1e750448cd5f239736290b789606c4ee415e3 (patch)
tree2983430b2af44c1b7cfa60a57b0d2db526e3d963
parentddfb1653c40ff06c9ff2cb5b2fac22fcaa645efe (diff)
downloadpygobject-25c1e750448cd5f239736290b789606c4ee415e3.tar.gz
Test for basestring and use str if not present
-rw-r--r--glib/option.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/glib/option.py b/glib/option.py
index 027752f3..f76215a3 100644
--- a/glib/option.py
+++ b/glib/option.py
@@ -49,6 +49,11 @@ __all__ = [
"make_option",
]
+try:
+ _basestring = basestring
+except NameError:
+ _basestring = str
+
class Option(optparse.Option):
"""Represents a command line option
@@ -214,7 +219,7 @@ class OptionGroup(optparse.OptionGroup):
def set_values_to_defaults(self):
for option in self.option_list:
default = self.defaults.get(option.dest)
- if isinstance(default, basestring):
+ if isinstance(default, _basestring):
opt_str = option.get_opt_string()
self.defaults[option.dest] = option.check_value(
opt_str, default)
@@ -292,7 +297,7 @@ class OptionParser(optparse.OptionParser):
return context
def add_option_group(self, *args, **kwargs):
- if isinstance(args[0], basestring):
+ if isinstance(args[0], _basestring):
optparse.OptionParser.add_option_group(self,
OptionGroup(self, *args, **kwargs))
return