mirror of
				https://github.com/python/cpython.git
				synced 2025-11-04 03:44:55 +00:00 
			
		
		
		
	svn+ssh://pythondev@svn.python.org/python/trunk
........
  r53624 | peter.astrand | 2007-02-02 20:06:36 +0100 (Fri, 02 Feb 2007) | 1 line
  We had several if statements checking the value of a fd. This is unsafe, since valid fds might be zero. We should check for not None instead.
........
  r53635 | kurt.kaiser | 2007-02-05 07:03:18 +0100 (Mon, 05 Feb 2007) | 2 lines
  Add 'raw' support to configHandler. Patch 1650174 Tal Einat.
........
  r53641 | kurt.kaiser | 2007-02-06 00:02:16 +0100 (Tue, 06 Feb 2007) | 5 lines
  1. Calltips now 'handle' tuples in the argument list (display '<tuple>' :)
     Suggested solution by Christos Georgiou, Bug 791968.
  2. Clean up tests, were not failing when they should have been.
  4. Remove some camelcase and an unneeded try/except block.
........
  r53644 | kurt.kaiser | 2007-02-06 04:21:40 +0100 (Tue, 06 Feb 2007) | 2 lines
  Clean up ModifiedInterpreter.runcode() structure
........
  r53646 | peter.astrand | 2007-02-06 16:37:50 +0100 (Tue, 06 Feb 2007) | 1 line
  Applied patch 1124861.3.patch to solve bug #1124861: Automatically create pipes on Windows, if GetStdHandle fails. Will backport.
........
  r53648 | lars.gustaebel | 2007-02-06 19:38:13 +0100 (Tue, 06 Feb 2007) | 4 lines
  Patch #1652681: create nonexistent files in append mode and
  allow appending to empty files.
........
  r53649 | kurt.kaiser | 2007-02-06 20:09:43 +0100 (Tue, 06 Feb 2007) | 4 lines
  Updated patch (CodeContext.061217.patch) to
  [ 1362975 ] CodeContext - Improved text indentation
  Tal Einat 16Dec06
........
  r53650 | kurt.kaiser | 2007-02-06 20:21:19 +0100 (Tue, 06 Feb 2007) | 2 lines
  narrow exception per [ 1540849 ] except too broad
........
  r53653 | kurt.kaiser | 2007-02-07 04:39:41 +0100 (Wed, 07 Feb 2007) | 4 lines
  [ 1621265 ] Auto-completion list placement
  Move AC window below input line unless not enough space, then put it above.
  Patch: Tal Einat
........
  r53654 | kurt.kaiser | 2007-02-07 09:07:13 +0100 (Wed, 07 Feb 2007) | 2 lines
  Handle AttributeError during calltip lookup
........
  r53656 | raymond.hettinger | 2007-02-07 21:08:22 +0100 (Wed, 07 Feb 2007) | 3 lines
  SF #1615701:  make d.update(m) honor __getitem__() and keys() in dict subclasses
........
  r53658 | raymond.hettinger | 2007-02-07 22:04:20 +0100 (Wed, 07 Feb 2007) | 1 line
  SF: 1397711 Set docs conflated immutable and hashable
........
  r53660 | raymond.hettinger | 2007-02-07 22:42:17 +0100 (Wed, 07 Feb 2007) | 1 line
  Check for a common user error with defaultdict().
........
  r53662 | raymond.hettinger | 2007-02-07 23:24:07 +0100 (Wed, 07 Feb 2007) | 1 line
  Bug #1575169: operator.isSequenceType() now returns False for subclasses of dict.
........
  r53664 | raymond.hettinger | 2007-02-08 00:49:03 +0100 (Thu, 08 Feb 2007) | 1 line
  Silence compiler warning
........
  r53666 | raymond.hettinger | 2007-02-08 01:07:32 +0100 (Thu, 08 Feb 2007) | 1 line
  Do not let overflows in enumerate() and count() pass silently.
........
  r53668 | raymond.hettinger | 2007-02-08 01:50:39 +0100 (Thu, 08 Feb 2007) | 1 line
  Bypass set specific optimizations for set and frozenset subclasses.
........
  r53670 | raymond.hettinger | 2007-02-08 02:42:35 +0100 (Thu, 08 Feb 2007) | 1 line
  Fix docstring bug
........
  r53671 | martin.v.loewis | 2007-02-08 10:13:36 +0100 (Thu, 08 Feb 2007) | 3 lines
  Bug #1653736: Complain about keyword arguments to time.isoformat.
  Will backport to 2.5.
........
  r53679 | kurt.kaiser | 2007-02-08 23:58:18 +0100 (Thu, 08 Feb 2007) | 6 lines
  Corrected some bugs in AutoComplete.  Also, Page Up/Down in ACW implemented;
  mouse and cursor selection in ACWindow implemented; double Tab inserts current
  selection and closes ACW (similar to double-click and Return); scroll wheel now
  works in ACW.  Added AutoComplete instructions to IDLE Help.
........
  r53689 | martin.v.loewis | 2007-02-09 13:19:32 +0100 (Fri, 09 Feb 2007) | 3 lines
  Bug #1653736: Properly discard third argument to slot_nb_inplace_power.
  Will backport.
........
  r53691 | martin.v.loewis | 2007-02-09 13:36:48 +0100 (Fri, 09 Feb 2007) | 4 lines
  Bug #1600860: Search for shared python library in LIBDIR, not
  lib/python/config, on "linux" and "gnu" systems.
  Will backport.
........
  r53693 | martin.v.loewis | 2007-02-09 13:58:49 +0100 (Fri, 09 Feb 2007) | 2 lines
  Update broken link. Will backport to 2.5.
........
  r53697 | georg.brandl | 2007-02-09 19:48:41 +0100 (Fri, 09 Feb 2007) | 2 lines
  Bug #1656078: typo in in profile docs.
........
  r53731 | brett.cannon | 2007-02-11 06:36:00 +0100 (Sun, 11 Feb 2007) | 3 lines
  Change a very minor inconsistency (that is purely cosmetic) in the AST
  definition.
........
  r53735 | skip.montanaro | 2007-02-11 19:24:37 +0100 (Sun, 11 Feb 2007) | 1 line
  fix trace.py --ignore-dir
........
  r53741 | brett.cannon | 2007-02-11 20:44:41 +0100 (Sun, 11 Feb 2007) | 3 lines
  Check in changed Python-ast.c from a cosmetic change to Python.asdl (in
  r53731).
........
  r53751 | brett.cannon | 2007-02-12 04:51:02 +0100 (Mon, 12 Feb 2007) | 5 lines
  Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c
  is specified at the top of the file.  Also add a note that Python/Python-ast.c
  needs to be committed separately after a change to the AST grammar to capture
  the revision number of the change (which is what __version__ is set to).
........
  r53752 | lars.gustaebel | 2007-02-12 10:25:53 +0100 (Mon, 12 Feb 2007) | 3 lines
  Bug #1656581: Point out that external file objects are supposed to be
  at position 0.
........
  r53754 | martin.v.loewis | 2007-02-12 13:21:10 +0100 (Mon, 12 Feb 2007) | 3 lines
  Patch 1463026: Support default namespace in XMLGenerator.
  Fixes #847665. Will backport.
........
  r53757 | armin.rigo | 2007-02-12 17:23:24 +0100 (Mon, 12 Feb 2007) | 4 lines
  Fix the line to what is my guess at the original author's meaning.
  (The line has no effect anyway, but is present because it's
  customary call the base class __init__).
........
  r53763 | martin.v.loewis | 2007-02-13 09:34:45 +0100 (Tue, 13 Feb 2007) | 3 lines
  Patch #685268: Consider a package's __path__ in imputil.
  Will backport.
........
  r53765 | martin.v.loewis | 2007-02-13 10:49:38 +0100 (Tue, 13 Feb 2007) | 2 lines
  Patch #698833: Support file decryption in zipfile.
........
  r53766 | martin.v.loewis | 2007-02-13 11:10:39 +0100 (Tue, 13 Feb 2007) | 3 lines
  Patch #1517891: Make 'a' create the file if it doesn't exist.
  Fixes #1514451.
........
  r53767 | martin.v.loewis | 2007-02-13 13:08:24 +0100 (Tue, 13 Feb 2007) | 3 lines
  Bug #1658794: Remove extraneous 'this'.
  Will backport to 2.5.
........
  r53769 | martin.v.loewis | 2007-02-13 13:14:19 +0100 (Tue, 13 Feb 2007) | 3 lines
  Patch #1657276: Make NETLINK_DNRTMSG conditional.
  Will backport.
........
  r53771 | lars.gustaebel | 2007-02-13 17:09:24 +0100 (Tue, 13 Feb 2007) | 4 lines
  Patch #1647484: Renamed GzipFile's filename attribute to name. The
  filename attribute is still accessible as a property that emits a
  DeprecationWarning.
........
  r53772 | lars.gustaebel | 2007-02-13 17:24:00 +0100 (Tue, 13 Feb 2007) | 3 lines
  Strip the '.gz' extension from the filename that is written to the
  gzip header.
........
  r53774 | martin.v.loewis | 2007-02-14 11:07:37 +0100 (Wed, 14 Feb 2007) | 2 lines
  Patch #1432399: Add HCI sockets.
........
  r53775 | martin.v.loewis | 2007-02-14 12:30:07 +0100 (Wed, 14 Feb 2007) | 2 lines
  Update 1432399 to removal of _BT_SOCKADDR_MEMB.
........
  r53776 | martin.v.loewis | 2007-02-14 12:30:56 +0100 (Wed, 14 Feb 2007) | 3 lines
  Ignore directory time stamps when considering
  whether to rerun libffi configure.
........
  r53778 | lars.gustaebel | 2007-02-14 15:45:12 +0100 (Wed, 14 Feb 2007) | 4 lines
  A missing binary mode in AppendTest caused failures in Windows
  Buildbot.
........
  r53782 | martin.v.loewis | 2007-02-15 10:51:35 +0100 (Thu, 15 Feb 2007) | 2 lines
  Patch #1397848: add the reasoning behind no-resize-on-shrinkage.
........
  r53783 | georg.brandl | 2007-02-15 11:37:59 +0100 (Thu, 15 Feb 2007) | 2 lines
  Make functools.wraps() docs a bit clearer.
........
  r53785 | georg.brandl | 2007-02-15 12:29:04 +0100 (Thu, 15 Feb 2007) | 2 lines
  Patch #1494140: Add documentation for the new struct.Struct object.
........
  r53787 | georg.brandl | 2007-02-15 12:29:55 +0100 (Thu, 15 Feb 2007) | 2 lines
  Add missing \versionadded.
........
  r53800 | brett.cannon | 2007-02-15 23:54:39 +0100 (Thu, 15 Feb 2007) | 11 lines
  Update the encoding package's search function to use absolute imports when
  calling __import__.  This helps make the expected search locations for encoding
  modules be more explicit.
  One could use an explicit value for __path__ when making the call to __import__
  to force the exact location searched for encodings.  This would give the most
  strict search path possible if one is worried about malicious code being
  imported.  The unfortunate side-effect of that is that if __path__ was modified
  on 'encodings' on purpose in a safe way it would not be picked up in future
  __import__ calls.
........
  r53801 | brett.cannon | 2007-02-16 20:33:01 +0100 (Fri, 16 Feb 2007) | 2 lines
  Make the __import__ call in encodings.__init__ absolute with a level 0 call.
........
  r53809 | vinay.sajip | 2007-02-16 23:36:24 +0100 (Fri, 16 Feb 2007) | 1 line
  Minor fix for currentframe (SF #1652788).
........
  r53818 | raymond.hettinger | 2007-02-19 03:03:19 +0100 (Mon, 19 Feb 2007) | 3 lines
  Extend work on revision 52962:  Eliminate redundant calls to PyObject_Hash().
........
  r53820 | raymond.hettinger | 2007-02-19 05:08:43 +0100 (Mon, 19 Feb 2007) | 1 line
  Add merge() function to heapq.
........
  r53821 | raymond.hettinger | 2007-02-19 06:28:28 +0100 (Mon, 19 Feb 2007) | 1 line
  Add tie-breaker count to preserve sort stability.
........
  r53822 | raymond.hettinger | 2007-02-19 07:59:32 +0100 (Mon, 19 Feb 2007) | 1 line
  Use C heapreplace() instead of slower _siftup() in pure python.
........
  r53823 | raymond.hettinger | 2007-02-19 08:30:21 +0100 (Mon, 19 Feb 2007) | 1 line
  Add test for merge stability
........
  r53824 | raymond.hettinger | 2007-02-19 10:14:10 +0100 (Mon, 19 Feb 2007) | 1 line
  Provide an example of defaultdict with non-zero constant factory function.
........
  r53825 | lars.gustaebel | 2007-02-19 10:54:47 +0100 (Mon, 19 Feb 2007) | 2 lines
  Moved misplaced news item.
........
  r53826 | martin.v.loewis | 2007-02-19 11:55:19 +0100 (Mon, 19 Feb 2007) | 3 lines
  Patch #1490190: posixmodule now includes os.chflags() and os.lchflags()
  functions on platforms where the underlying system calls are available.
........
  r53827 | raymond.hettinger | 2007-02-19 19:15:04 +0100 (Mon, 19 Feb 2007) | 1 line
  Fixup docstrings for merge().
........
  r53829 | raymond.hettinger | 2007-02-19 21:44:04 +0100 (Mon, 19 Feb 2007) | 1 line
  Fixup set/dict interoperability.
........
  r53837 | raymond.hettinger | 2007-02-21 06:20:38 +0100 (Wed, 21 Feb 2007) | 1 line
  Add itertools.izip_longest().
........
  r53838 | raymond.hettinger | 2007-02-21 18:22:05 +0100 (Wed, 21 Feb 2007) | 1 line
  Remove filler struct item and fix leak.
........
		
	
			
		
			
				
	
	
		
			205 lines
		
	
	
	
		
			5.9 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			205 lines
		
	
	
	
		
			5.9 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
"""Utility functions for copying files and directory trees.
 | 
						|
 | 
						|
XXX The functions here don't copy the resource fork or other metadata on Mac.
 | 
						|
 | 
						|
"""
 | 
						|
 | 
						|
import os
 | 
						|
import sys
 | 
						|
import stat
 | 
						|
from os.path import abspath
 | 
						|
 | 
						|
__all__ = ["copyfileobj","copyfile","copymode","copystat","copy","copy2",
 | 
						|
           "copytree","move","rmtree","Error"]
 | 
						|
 | 
						|
class Error(EnvironmentError):
 | 
						|
    pass
 | 
						|
 | 
						|
def copyfileobj(fsrc, fdst, length=16*1024):
 | 
						|
    """copy data from file-like object fsrc to file-like object fdst"""
 | 
						|
    while 1:
 | 
						|
        buf = fsrc.read(length)
 | 
						|
        if not buf:
 | 
						|
            break
 | 
						|
        fdst.write(buf)
 | 
						|
 | 
						|
def _samefile(src, dst):
 | 
						|
    # Macintosh, Unix.
 | 
						|
    if hasattr(os.path,'samefile'):
 | 
						|
        try:
 | 
						|
            return os.path.samefile(src, dst)
 | 
						|
        except OSError:
 | 
						|
            return False
 | 
						|
 | 
						|
    # All other platforms: check for same pathname.
 | 
						|
    return (os.path.normcase(os.path.abspath(src)) ==
 | 
						|
            os.path.normcase(os.path.abspath(dst)))
 | 
						|
 | 
						|
def copyfile(src, dst):
 | 
						|
    """Copy data from src to dst"""
 | 
						|
    if _samefile(src, dst):
 | 
						|
        raise Error, "`%s` and `%s` are the same file" % (src, dst)
 | 
						|
 | 
						|
    fsrc = None
 | 
						|
    fdst = None
 | 
						|
    try:
 | 
						|
        fsrc = open(src, 'rb')
 | 
						|
        fdst = open(dst, 'wb')
 | 
						|
        copyfileobj(fsrc, fdst)
 | 
						|
    finally:
 | 
						|
        if fdst:
 | 
						|
            fdst.close()
 | 
						|
        if fsrc:
 | 
						|
            fsrc.close()
 | 
						|
 | 
						|
def copymode(src, dst):
 | 
						|
    """Copy mode bits from src to dst"""
 | 
						|
    if hasattr(os, 'chmod'):
 | 
						|
        st = os.stat(src)
 | 
						|
        mode = stat.S_IMODE(st.st_mode)
 | 
						|
        os.chmod(dst, mode)
 | 
						|
 | 
						|
def copystat(src, dst):
 | 
						|
    """Copy all stat info (mode bits, atime, mtime, flags) from src to dst"""
 | 
						|
    st = os.stat(src)
 | 
						|
    mode = stat.S_IMODE(st.st_mode)
 | 
						|
    if hasattr(os, 'utime'):
 | 
						|
        os.utime(dst, (st.st_atime, st.st_mtime))
 | 
						|
    if hasattr(os, 'chmod'):
 | 
						|
        os.chmod(dst, mode)
 | 
						|
    if hasattr(os, 'chflags') and hasattr(st, 'st_flags'):
 | 
						|
        os.chflags(dst, st.st_flags)
 | 
						|
 | 
						|
 | 
						|
def copy(src, dst):
 | 
						|
    """Copy data and mode bits ("cp src dst").
 | 
						|
 | 
						|
    The destination may be a directory.
 | 
						|
 | 
						|
    """
 | 
						|
    if os.path.isdir(dst):
 | 
						|
        dst = os.path.join(dst, os.path.basename(src))
 | 
						|
    copyfile(src, dst)
 | 
						|
    copymode(src, dst)
 | 
						|
 | 
						|
def copy2(src, dst):
 | 
						|
    """Copy data and all stat info ("cp -p src dst").
 | 
						|
 | 
						|
    The destination may be a directory.
 | 
						|
 | 
						|
    """
 | 
						|
    if os.path.isdir(dst):
 | 
						|
        dst = os.path.join(dst, os.path.basename(src))
 | 
						|
    copyfile(src, dst)
 | 
						|
    copystat(src, dst)
 | 
						|
 | 
						|
 | 
						|
def copytree(src, dst, symlinks=False):
 | 
						|
    """Recursively copy a directory tree using copy2().
 | 
						|
 | 
						|
    The destination directory must not already exist.
 | 
						|
    If exception(s) occur, an Error is raised with a list of reasons.
 | 
						|
 | 
						|
    If the optional symlinks flag is true, symbolic links in the
 | 
						|
    source tree result in symbolic links in the destination tree; if
 | 
						|
    it is false, the contents of the files pointed to by symbolic
 | 
						|
    links are copied.
 | 
						|
 | 
						|
    XXX Consider this example code rather than the ultimate tool.
 | 
						|
 | 
						|
    """
 | 
						|
    names = os.listdir(src)
 | 
						|
    os.makedirs(dst)
 | 
						|
    errors = []
 | 
						|
    for name in names:
 | 
						|
        srcname = os.path.join(src, name)
 | 
						|
        dstname = os.path.join(dst, name)
 | 
						|
        try:
 | 
						|
            if symlinks and os.path.islink(srcname):
 | 
						|
                linkto = os.readlink(srcname)
 | 
						|
                os.symlink(linkto, dstname)
 | 
						|
            elif os.path.isdir(srcname):
 | 
						|
                copytree(srcname, dstname, symlinks)
 | 
						|
            else:
 | 
						|
                copy2(srcname, dstname)
 | 
						|
            # XXX What about devices, sockets etc.?
 | 
						|
        except (IOError, os.error) as why:
 | 
						|
            errors.append((srcname, dstname, str(why)))
 | 
						|
        # catch the Error from the recursive copytree so that we can
 | 
						|
        # continue with other files
 | 
						|
        except Error as err:
 | 
						|
            errors.extend(err.args[0])
 | 
						|
    try:
 | 
						|
        copystat(src, dst)
 | 
						|
    except WindowsError:
 | 
						|
        # can't copy file access times on Windows
 | 
						|
        pass
 | 
						|
    except OSError as why:
 | 
						|
        errors.extend((src, dst, str(why)))
 | 
						|
    if errors:
 | 
						|
        raise Error, errors
 | 
						|
 | 
						|
def rmtree(path, ignore_errors=False, onerror=None):
 | 
						|
    """Recursively delete a directory tree.
 | 
						|
 | 
						|
    If ignore_errors is set, errors are ignored; otherwise, if onerror
 | 
						|
    is set, it is called to handle the error with arguments (func,
 | 
						|
    path, exc_info) where func is os.listdir, os.remove, or os.rmdir;
 | 
						|
    path is the argument to that function that caused it to fail; and
 | 
						|
    exc_info is a tuple returned by sys.exc_info().  If ignore_errors
 | 
						|
    is false and onerror is None, an exception is raised.
 | 
						|
 | 
						|
    """
 | 
						|
    if ignore_errors:
 | 
						|
        def onerror(*args):
 | 
						|
            pass
 | 
						|
    elif onerror is None:
 | 
						|
        def onerror(*args):
 | 
						|
            raise
 | 
						|
    names = []
 | 
						|
    try:
 | 
						|
        names = os.listdir(path)
 | 
						|
    except os.error as err:
 | 
						|
        onerror(os.listdir, path, sys.exc_info())
 | 
						|
    for name in names:
 | 
						|
        fullname = os.path.join(path, name)
 | 
						|
        try:
 | 
						|
            mode = os.lstat(fullname).st_mode
 | 
						|
        except os.error:
 | 
						|
            mode = 0
 | 
						|
        if stat.S_ISDIR(mode):
 | 
						|
            rmtree(fullname, ignore_errors, onerror)
 | 
						|
        else:
 | 
						|
            try:
 | 
						|
                os.remove(fullname)
 | 
						|
            except os.error as err:
 | 
						|
                onerror(os.remove, fullname, sys.exc_info())
 | 
						|
    try:
 | 
						|
        os.rmdir(path)
 | 
						|
    except os.error:
 | 
						|
        onerror(os.rmdir, path, sys.exc_info())
 | 
						|
 | 
						|
def move(src, dst):
 | 
						|
    """Recursively move a file or directory to another location.
 | 
						|
 | 
						|
    If the destination is on our current filesystem, then simply use
 | 
						|
    rename.  Otherwise, copy src to the dst and then remove src.
 | 
						|
    A lot more could be done here...  A look at a mv.c shows a lot of
 | 
						|
    the issues this implementation glosses over.
 | 
						|
 | 
						|
    """
 | 
						|
 | 
						|
    try:
 | 
						|
        os.rename(src, dst)
 | 
						|
    except OSError:
 | 
						|
        if os.path.isdir(src):
 | 
						|
            if destinsrc(src, dst):
 | 
						|
                raise Error, "Cannot move a directory '%s' into itself '%s'." % (src, dst)
 | 
						|
            copytree(src, dst, symlinks=True)
 | 
						|
            rmtree(src)
 | 
						|
        else:
 | 
						|
            copy2(src,dst)
 | 
						|
            os.unlink(src)
 | 
						|
 | 
						|
def destinsrc(src, dst):
 | 
						|
    return abspath(dst).startswith(abspath(src))
 |