← Back to branch summary

~pythonregexp2.7/python/issue2636-11

« back to all changes in this revision

Viewing changes to Lib/xml/dom/minidom.py

  • Committer: Jeffrey C. "The TimeHorse" Jacobs
  • Date: 2008-09-21 17:53:26 UTC
  • mfrom: (39025.1.14 Regexp-2.7)
  • Revision ID: darklord@timehorse.com-20080921175326-92vaej2hc3yuecxb
Merged in changes from the core Regexp branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Lib/xml/dom/minidom.py
245
245
        except AttributeError:
246
246
            d = {}
247
247
            self._user_data = d
248
 
        if d.has_key(key):
 
248
        if key in d:
249
249
            old = d[key][0]
250
250
        if data is None:
251
251
            # ignore handlers passed for None
516
516
 
517
517
    __len__ = _get_length
518
518
 
 
519
    __hash__ = None # Mutable type can't be correctly hashed
519
520
    def __cmp__(self, other):
520
521
        if self._attrs is getattr(other, "_attrs", None):
521
522
            return 0
562
563
            _clear_id_cache(self._ownerElement)
563
564
            del self._attrs[n.nodeName]
564
565
            del self._attrsNS[(n.namespaceURI, n.localName)]
565
 
            if n.__dict__.has_key('ownerElement'):
 
566
            if 'ownerElement' in n.__dict__:
566
567
                n.__dict__['ownerElement'] = None
567
568
            return n
568
569
        else:
574
575
            _clear_id_cache(self._ownerElement)
575
576
            del self._attrsNS[(n.namespaceURI, n.localName)]
576
577
            del self._attrs[n.nodeName]
577
 
            if n.__dict__.has_key('ownerElement'):
 
578
            if 'ownerElement' in n.__dict__:
578
579
                n.__dict__['ownerElement'] = None
579
580
            return n
580
581
        else:
1664
1665
        return n
1665
1666
 
1666
1667
    def getElementById(self, id):
1667
 
        if self._id_cache.has_key(id):
 
1668
        if id in self._id_cache:
1668
1669
            return self._id_cache[id]
1669
1670
        if not (self._elem_info or self._magic_id_count):
1670
1671
            return None