diff options
| author | Sylvain <syt@logilab.fr> | 2006-05-16 15:42:02 +0200 |
|---|---|---|
| committer | Sylvain <syt@logilab.fr> | 2006-05-16 15:42:02 +0200 |
| commit | 767d41c3ba6b55be2c635ba7c2627883b4e40884 (patch) | |
| tree | d119d2fbf017bc7d0511d5dbe1170e186959ca20 | |
| parent | 94d756f77af885389c5e17a1fc2c4cd14c4727b5 (diff) | |
| download | logilab-common-767d41c3ba6b55be2c635ba7c2627883b4e40884.tar.gz | |
fix some 2.2 compat issues (still pb with missing dict.pop method)
| -rw-r--r-- | configuration.py | 2 | ||||
| -rw-r--r-- | optik_ext.py | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/configuration.py b/configuration.py index be3113b..7ff06c1 100644 --- a/configuration.py +++ b/configuration.py @@ -71,6 +71,8 @@ config.generate_config() :contact: http://www.logilab.fr/ -- mailto:python-projects@logilab.org """ +from __future__ import generators + __revision__ = "$Id: configuration.py,v 1.40 2005-11-22 13:13:00 syt Exp $" __docformat__ = "restructuredtext en" __all__ = ('OptionsManagerMixIn', 'OptionsProviderMixIn', diff --git a/optik_ext.py b/optik_ext.py index 58db470..499c501 100644 --- a/optik_ext.py +++ b/optik_ext.py @@ -41,11 +41,14 @@ try: from optparse import OptionParser as BaseParser, Option as BaseOption, \ OptionGroup, OptionValueError, OptionError, Values, HelpFormatter, \ NO_DEFAULT -except Exception, ex: +except ImportError: # python < 2.3 from optik import OptionParser as BaseParser, Option as BaseOption, \ - OptionGroup, OptionValueError, OptionError, Values, HelpFormatter, \ - NO_DEFAULT + OptionGroup, OptionValueError, OptionError, Values, HelpFormatter + try: + from optik import NO_DEFAULT + except: + NO_DEFAULT = [] OPTPARSE_FORMAT_DEFAULT = sys.version_info >= (2, 4) |