~pythonregexp2.7/python/issue2636-11

« back to all changes in this revision

Viewing changes to Lib/xml/sax/__init__.py

  • Committer: Jeffrey C. "The TimeHorse" Jacobs
  • Date: 2008-09-21 13:47:31 UTC
  • mfrom: (39021.1.404 Regexp-2.7)
  • mto: This revision was merged to the branch mainline in revision 39030.
  • Revision ID: darklord@timehorse.com-20080921134731-rudomuzeh1b2tz1y
Merged in changes from the latest python source snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
81
81
            return _create_parser(parser_name)
82
82
        except ImportError,e:
83
83
            import sys
84
 
            if sys.modules.has_key(parser_name):
 
84
            if parser_name in sys.modules:
85
85
                # The parser module was found, but importing it
86
86
                # failed unexpectedly, pass this exception through
87
87
                raise