*** copy.py.orig Wed Mar 13 18:42:32 2002 --- copy.py Sun May 26 12:28:47 2002 *************** *** 164,180 **** copierfunction = _deepcopy_dispatch[type(x)] except KeyError: try: ! copier = x.__deepcopy__ ! except AttributeError: try: ! reductor = x.__reduce__ except AttributeError: ! raise error, \ ! "un-deep-copyable object of type %s" % type(x) else: ! y = _reconstruct(x, reductor(), 1, memo) ! else: ! y = copier(memo) else: y = copierfunction(x, memo) memo[d] = y --- 164,187 ---- copierfunction = _deepcopy_dispatch[type(x)] except KeyError: try: ! issc = issubclass(type(x), type) ! except TypeError: ! issc = 0 ! if issc: ! y = _deepcopy_dispatch[type](x, memo) ! else: try: ! copier = x.__deepcopy__ except AttributeError: ! try: ! reductor = x.__reduce__ ! except AttributeError: ! raise error, \ ! "un-deep-copyable object of type %s" % type(x) ! else: ! y = _reconstruct(x, reductor(), 1, memo) else: ! y = copier(memo) else: y = copierfunction(x, memo) memo[d] = y