Merged revisions 68363 via svnmerge from

Merged revisions 68363 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r68363 | antoine.pitrou | 2009-01-06 20:02:24 +0100 (mar., 06 janv. 2009) | 17 lines

  Merged revisions 68360-68361 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r68360 | antoine.pitrou | 2009-01-06 19:10:47 +0100 (mar., 06 janv. 2009) | 7 lines

    Issue #1180193: When importing a module from a .pyc (or .pyo) file with
    an existing .py counterpart, override the co_filename attributes of all
    code objects if the original filename is obsolete (which can happen if the
    file has been renamed, moved, or if it is accessed through different paths).
    Patch by Ziga Seilnacht and Jean-Paul Calderone.
  ........
    r68361 | antoine.pitrou | 2009-01-06 19:34:08 +0100 (mar., 06 janv. 2009) | 3 lines

    Use shutil.rmtree rather than os.rmdir.
  ........
................