Mailman 3 December 2014 - Python-checkins

Daily reference leaks (01437956ea67): sum=3
by solipsis＠pitrou.net 31 Dec '14

31 Dec '14

results for 01437956ea67 on branch "default" -------------------------------------------- test_functools leaked [0, 0, 3] memory blocks, sum=3 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogUDILRY', '-x']

1 0

cpython (merge 3.4 -> default): merge 3.4
by benjamin.peterson 30 Dec '14

30 Dec '14

https://hg.python.org/cpython/rev/01437956ea67 changeset: 93994:01437956ea67 parent: 93992:33603f7949c5 parent: 93993:29689050ec78 user: Benjamin Peterson <benjamin(a)python.org> date: Tue Dec 30 15:17:09 2014 -0600 summary: merge 3.4 files: Doc/library/ftplib.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst --- a/Doc/library/ftplib.rst +++ b/Doc/library/ftplib.rst @@ -414,7 +414,7 @@ .. attribute:: FTP_TLS.ssl_version - The SSL version to use (defaults to *TLSv1*). + The SSL version to use (defaults to :attr:`ssl.PROTOCOL_SSLv23`). .. method:: FTP_TLS.auth() -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): update docs for #23111
by benjamin.peterson 30 Dec '14

30 Dec '14

https://hg.python.org/cpython/rev/29689050ec78 changeset: 93993:29689050ec78 branch: 3.4 parent: 93991:414c450e8406 user: Benjamin Peterson <benjamin(a)python.org> date: Tue Dec 30 15:17:03 2014 -0600 summary: update docs for #23111 files: Doc/library/ftplib.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst --- a/Doc/library/ftplib.rst +++ b/Doc/library/ftplib.rst @@ -414,7 +414,7 @@ .. attribute:: FTP_TLS.ssl_version - The SSL version to use (defaults to *TLSv1*). + The SSL version to use (defaults to :attr:`ssl.PROTOCOL_SSLv23`). .. method:: FTP_TLS.auth() -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): make PROTOCOL_SSLv23 the default protocol version for ftplib (closes #23111)
by benjamin.peterson 30 Dec '14

30 Dec '14

https://hg.python.org/cpython/rev/414c450e8406 changeset: 93991:414c450e8406 branch: 3.4 parent: 93987:483746c32296 user: Benjamin Peterson <benjamin(a)python.org> date: Tue Dec 30 15:15:43 2014 -0600 summary: make PROTOCOL_SSLv23 the default protocol version for ftplib (closes #23111) files: Lib/ftplib.py | 4 ++-- Misc/NEWS | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Lib/ftplib.py b/Lib/ftplib.py --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -713,7 +713,7 @@ '221 Goodbye.' >>> ''' - ssl_version = ssl.PROTOCOL_TLSv1 + ssl_version = ssl.PROTOCOL_SSLv23 def __init__(self, host='', user='', passwd='', acct='', keyfile=None, certfile=None, context=None, @@ -743,7 +743,7 @@ '''Set up secure control connection by using TLS/SSL.''' if isinstance(self.sock, ssl.SSLSocket): raise ValueError("Already using TLS") - if self.ssl_version == ssl.PROTOCOL_TLSv1: + if self.ssl_version >= ssl.PROTOCOL_SSLv23: resp = self.voidcmd('AUTH TLS') else: resp = self.voidcmd('AUTH SSL') diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -41,6 +41,9 @@ Library ------- +- Issue #23111: In the ftplib, make ssl.PROTOCOL_SSLv23 the default protocol + version. + - Issue #22585: On OpenBSD 5.6 and newer, os.urandom() now calls getentropy(), instead of reading /dev/urandom, to get pseudo-random bytes. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): merge 3.4 (#23111)
by benjamin.peterson 30 Dec '14

30 Dec '14

https://hg.python.org/cpython/rev/33603f7949c5 changeset: 93992:33603f7949c5 parent: 93990:d5f2bcfd544c parent: 93991:414c450e8406 user: Benjamin Peterson <benjamin(a)python.org> date: Tue Dec 30 15:16:13 2014 -0600 summary: merge 3.4 (#23111) files: Lib/ftplib.py | 4 ++-- Misc/NEWS | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Lib/ftplib.py b/Lib/ftplib.py --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -713,7 +713,7 @@ '221 Goodbye.' >>> ''' - ssl_version = ssl.PROTOCOL_TLSv1 + ssl_version = ssl.PROTOCOL_SSLv23 def __init__(self, host='', user='', passwd='', acct='', keyfile=None, certfile=None, context=None, @@ -743,7 +743,7 @@ '''Set up secure control connection by using TLS/SSL.''' if isinstance(self.sock, ssl.SSLSocket): raise ValueError("Already using TLS") - if self.ssl_version == ssl.PROTOCOL_TLSv1: + if self.ssl_version >= ssl.PROTOCOL_SSLv23: resp = self.voidcmd('AUTH TLS') else: resp = self.voidcmd('AUTH SSL') diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -207,6 +207,9 @@ - Issue #23093: In the io, module allow more operations to work on detached streams. +- Issue #23111: In the ftplib, make ssl.PROTOCOL_SSLv23 the default protocol + version. + - Issue #22585: On OpenBSD 5.6 and newer, os.urandom() now calls getentropy(), instead of reading /dev/urandom, to get pseudo-random bytes. -- Repository URL: https://hg.python.org/cpython

1 0

cpython: whitespace
by antoine.pitrou 30 Dec '14

30 Dec '14

https://hg.python.org/cpython/rev/d5f2bcfd544c changeset: 93990:d5f2bcfd544c user: Antoine Pitrou <solipsis(a)pitrou.net> date: Tue Dec 30 22:09:42 2014 +0100 summary: whitespace files: Lib/pathlib.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Lib/pathlib.py b/Lib/pathlib.py --- a/Lib/pathlib.py +++ b/Lib/pathlib.py @@ -227,11 +227,11 @@ elif 'USERPROFILE' in os.environ: userhome = os.environ['USERPROFILE'] elif 'HOMEPATH' in os.environ: - try: - drv = os.environ['HOMEDRIVE'] - except KeyError: - drv = '' - userhome = drv + os.environ['HOMEPATH'] + try: + drv = os.environ['HOMEDRIVE'] + except KeyError: + drv = '' + userhome = drv + os.environ['HOMEPATH'] else: raise RuntimeError("Can't determine home directory") -- Repository URL: https://hg.python.org/cpython

1 0

cpython: Issue #19776: Add a expanduser() method on Path objects.
by antoine.pitrou 30 Dec '14

30 Dec '14

https://hg.python.org/cpython/rev/bee697b0fd18 changeset: 93989:bee697b0fd18 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Tue Dec 30 20:54:45 2014 +0100 summary: Issue #19776: Add a expanduser() method on Path objects. Patch by Serhiy. files: Doc/library/pathlib.rst | 15 ++- Lib/pathlib.py | 56 +++++++++++++ Lib/test/test_pathlib.py | 110 +++++++++++++++++++++++++++ Misc/NEWS | 2 + 4 files changed, 180 insertions(+), 3 deletions(-) diff --git a/Doc/library/pathlib.rst b/Doc/library/pathlib.rst --- a/Doc/library/pathlib.rst +++ b/Doc/library/pathlib.rst @@ -670,6 +670,18 @@ symlink *points to* an existing file or directory. +.. method:: Path.expanduser() + + Return a new path with expanded ``~`` and ``~user`` constructs, + as returned by :meth:`os.path.expanduser`:: + + >>> p = PosixPath('~/films/Monty Python') + >>> p.expanduser() + PosixPath('/home/eric/films/Monty Python') + + .. versionadded:: 3.5 + + .. method:: Path.glob(pattern) Glob the given *pattern* in the directory represented by this path, @@ -1003,7 +1015,4 @@ >>> p.read_text() 'Text file contents' - An existing file of the same name is overwritten. The optional parameters - have the same meaning as in :func:`open`. - .. versionadded:: 3.5 diff --git a/Lib/pathlib.py b/Lib/pathlib.py --- a/Lib/pathlib.py +++ b/Lib/pathlib.py @@ -221,6 +221,36 @@ # It's a path on a network drive => 'file://host/share/a/b' return 'file:' + urlquote_from_bytes(path.as_posix().encode('utf-8')) + def gethomedir(self, username): + if 'HOME' in os.environ: + userhome = os.environ['HOME'] + elif 'USERPROFILE' in os.environ: + userhome = os.environ['USERPROFILE'] + elif 'HOMEPATH' in os.environ: + try: + drv = os.environ['HOMEDRIVE'] + except KeyError: + drv = '' + userhome = drv + os.environ['HOMEPATH'] + else: + raise RuntimeError("Can't determine home directory") + + if username: + # Try to guess user home directory. By default all users + # directories are located in the same place and are named by + # corresponding usernames. If current user home directory points + # to nonstandard place, this guess is likely wrong. + if os.environ['USERNAME'] != username: + drv, root, parts = self.parse_parts((userhome,)) + if parts[-1] != os.environ['USERNAME']: + raise RuntimeError("Can't determine home directory " + "for %r" % username) + parts[-1] = username + if drv or root: + userhome = drv + root + self.join(parts[1:]) + else: + userhome = self.join(parts) + return userhome class _PosixFlavour(_Flavour): sep = '/' @@ -304,6 +334,21 @@ bpath = bytes(path) return 'file://' + urlquote_from_bytes(bpath) + def gethomedir(self, username): + if not username: + try: + return os.environ['HOME'] + except KeyError: + import pwd + return pwd.getpwuid(os.getuid()).pw_dir + else: + import pwd + try: + return pwd.getpwnam(username).pw_dir + except KeyError: + raise RuntimeError("Can't determine home directory " + "for %r" % username) + _windows_flavour = _WindowsFlavour() _posix_flavour = _PosixFlavour() @@ -1333,6 +1378,17 @@ # (see https://bitbucket.org/pitrou/pathlib/issue/12/) return False + def expanduser(self): + """ Return a new path with expanded ~ and ~user constructs + (as returned by os.path.expanduser) + """ + if (not (self._drv or self._root) and + self._parts and self._parts[0][:1] == '~'): + homedir = self._flavour.gethomedir(self._parts[0][1:]) + return self._from_parts([homedir] + self._parts[1:]) + + return self + class PosixPath(Path, PurePosixPath): __slots__ = () diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py --- a/Lib/test/test_pathlib.py +++ b/Lib/test/test_pathlib.py @@ -1286,6 +1286,19 @@ p = self.cls('') self.assertEqual(p.stat(), os.stat('.')) + def test_expanduser_common(self): + P = self.cls + p = P('~') + self.assertEqual(p.expanduser(), P(os.path.expanduser('~'))) + p = P('foo') + self.assertEqual(p.expanduser(), p) + p = P('/~') + self.assertEqual(p.expanduser(), p) + p = P('../~') + self.assertEqual(p.expanduser(), p) + p = P(P('').absolute().anchor) / '~' + self.assertEqual(p.expanduser(), p) + def test_exists(self): P = self.cls p = P(BASE) @@ -1959,6 +1972,48 @@ self.assertEqual(given, expect) self.assertEqual(set(p.rglob("FILEd*")), set()) + def test_expanduser(self): + P = self.cls + support.import_module('pwd') + import pwd + pwdent = pwd.getpwuid(os.getuid()) + username = pwdent.pw_name + userhome = pwdent.pw_dir.rstrip('/') + # find arbitrary different user (if exists) + for pwdent in pwd.getpwall(): + othername = pwdent.pw_name + otherhome = pwdent.pw_dir.rstrip('/') + if othername != username: + break + + p1 = P('~/Documents') + p2 = P('~' + username + '/Documents') + p3 = P('~' + othername + '/Documents') + p4 = P('../~' + username + '/Documents') + p5 = P('/~' + username + '/Documents') + p6 = P('') + p7 = P('~fakeuser/Documents') + + with support.EnvironmentVarGuard() as env: + env.pop('HOME', None) + + self.assertEqual(p1.expanduser(), P(userhome) / 'Documents') + self.assertEqual(p2.expanduser(), P(userhome) / 'Documents') + self.assertEqual(p3.expanduser(), P(otherhome) / 'Documents') + self.assertEqual(p4.expanduser(), p4) + self.assertEqual(p5.expanduser(), p5) + self.assertEqual(p6.expanduser(), p6) + self.assertRaises(RuntimeError, p7.expanduser) + + env['HOME'] = '/tmp' + self.assertEqual(p1.expanduser(), P('/tmp/Documents')) + self.assertEqual(p2.expanduser(), P(userhome) / 'Documents') + self.assertEqual(p3.expanduser(), P(otherhome) / 'Documents') + self.assertEqual(p4.expanduser(), p4) + self.assertEqual(p5.expanduser(), p5) + self.assertEqual(p6.expanduser(), p6) + self.assertRaises(RuntimeError, p7.expanduser) + @only_nt class WindowsPathTest(_BasePathTest, unittest.TestCase): @@ -1974,6 +2029,61 @@ p = P(BASE, "dirC") self.assertEqual(set(p.rglob("FILEd")), { P(BASE, "dirC/dirD/fileD") }) + def test_expanduser(self): + P = self.cls + with support.EnvironmentVarGuard() as env: + env.pop('HOME', None) + env.pop('USERPROFILE', None) + env.pop('HOMEPATH', None) + env.pop('HOMEDRIVE', None) + env['USERNAME'] = 'alice' + + # test that the path returns unchanged + p1 = P('~/My Documents') + p2 = P('~alice/My Documents') + p3 = P('~bob/My Documents') + p4 = P('/~/My Documents') + p5 = P('d:~/My Documents') + p6 = P('') + self.assertRaises(RuntimeError, p1.expanduser) + self.assertRaises(RuntimeError, p2.expanduser) + self.assertRaises(RuntimeError, p3.expanduser) + self.assertEqual(p4.expanduser(), p4) + self.assertEqual(p5.expanduser(), p5) + self.assertEqual(p6.expanduser(), p6) + + def check(): + env.pop('USERNAME', None) + self.assertEqual(p1.expanduser(), + P('C:/Users/alice/My Documents')) + self.assertRaises(KeyError, p2.expanduser) + env['USERNAME'] = 'alice' + self.assertEqual(p2.expanduser(), + P('C:/Users/alice/My Documents')) + self.assertEqual(p3.expanduser(), + P('C:/Users/bob/My Documents')) + self.assertEqual(p4.expanduser(), p4) + self.assertEqual(p5.expanduser(), p5) + self.assertEqual(p6.expanduser(), p6) + + # test the first lookup key in the env vars + env['HOME'] = 'C:\\Users\\alice' + check() + + # test that HOMEPATH is available instead + env.pop('HOME', None) + env['HOMEPATH'] = 'C:\\Users\\alice' + check() + + env['HOMEDRIVE'] = 'C:\\' + env['HOMEPATH'] = 'Users\\alice' + check() + + env.pop('HOMEDRIVE', None) + env.pop('HOMEPATH', None) + env['USERPROFILE'] = 'C:\\Users\\alice' + check() + if __name__ == "__main__": unittest.main() diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -196,6 +196,8 @@ Library ------- +- Issue #19776: Add a expanduser() method on Path objects. + - Issue #23112: Fix SimpleHTTPServer to correctly carry the query string and fragment when it redirects to add a trailing slash. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): merge 3.4 (#23130)
by benjamin.peterson 30 Dec '14

30 Dec '14

https://hg.python.org/cpython/rev/4b64d300a67a changeset: 93988:4b64d300a67a parent: 93983:ac176a69d188 parent: 93987:483746c32296 user: Benjamin Peterson <benjamin(a)python.org> date: Tue Dec 30 10:09:30 2014 -0600 summary: merge 3.4 (#23130) files: Tools/scripts/ftpmirror.py | 405 ------------------------- 1 files changed, 0 insertions(+), 405 deletions(-) diff --git a/Tools/scripts/ftpmirror.py b/Tools/scripts/ftpmirror.py deleted file mode 100755 --- a/Tools/scripts/ftpmirror.py +++ /dev/null @@ -1,405 +0,0 @@ -#! /usr/bin/env python3 - -"""Mirror a remote ftp subtree into a local directory tree. - -usage: ftpmirror [-v] [-q] [-i] [-m] [-n] [-r] [-s pat] - [-l username [-p passwd [-a account]]] - hostname[:port] [remotedir [localdir]] --v: verbose --q: quiet --i: interactive mode --m: macintosh server (NCSA telnet 2.4) (implies -n -s '*.o') --n: don't log in --r: remove local files/directories no longer pertinent --l username [-p passwd [-a account]]: login info (default .netrc or anonymous) --s pat: skip files matching pattern -hostname: remote host w/ optional port separated by ':' -remotedir: remote directory (default initial) -localdir: local directory (default current) -""" - -import os -import sys -import time -import getopt -import ftplib -import netrc -from fnmatch import fnmatch - -# Print usage message and exit -def usage(*args): - sys.stdout = sys.stderr - for msg in args: print(msg) - print(__doc__) - sys.exit(2) - -verbose = 1 # 0 for -q, 2 for -v -interactive = 0 -mac = 0 -rmok = 0 -nologin = 0 -skippats = ['.', '..', '.mirrorinfo'] - -# Main program: parse command line and start processing -def main(): - global verbose, interactive, mac, rmok, nologin - try: - opts, args = getopt.getopt(sys.argv[1:], 'a:bil:mnp:qrs:v') - except getopt.error as msg: - usage(msg) - login = '' - passwd = '' - account = '' - if not args: usage('hostname missing') - host = args[0] - port = 0 - if ':' in host: - host, port = host.split(':', 1) - port = int(port) - try: - auth = netrc.netrc().authenticators(host) - if auth is not None: - login, account, passwd = auth - except (netrc.NetrcParseError, IOError): - pass - for o, a in opts: - if o == '-l': login = a - if o == '-p': passwd = a - if o == '-a': account = a - if o == '-v': verbose = verbose + 1 - if o == '-q': verbose = 0 - if o == '-i': interactive = 1 - if o == '-m': mac = 1; nologin = 1; skippats.append('*.o') - if o == '-n': nologin = 1 - if o == '-r': rmok = 1 - if o == '-s': skippats.append(a) - remotedir = '' - localdir = '' - if args[1:]: - remotedir = args[1] - if args[2:]: - localdir = args[2] - if args[3:]: usage('too many arguments') - # - f = ftplib.FTP() - if verbose: print("Connecting to '%s%s'..." % (host, - (port and ":%d"%port or ""))) - f.connect(host,port) - if not nologin: - if verbose: - print('Logging in as %r...' % (login or 'anonymous')) - f.login(login, passwd, account) - if verbose: print('OK.') - pwd = f.pwd() - if verbose > 1: print('PWD =', repr(pwd)) - if remotedir: - if verbose > 1: print('cwd(%s)' % repr(remotedir)) - f.cwd(remotedir) - if verbose > 1: print('OK.') - pwd = f.pwd() - if verbose > 1: print('PWD =', repr(pwd)) - # - mirrorsubdir(f, localdir) - -# Core logic: mirror one subdirectory (recursively) -def mirrorsubdir(f, localdir): - pwd = f.pwd() - if localdir and not os.path.isdir(localdir): - if verbose: print('Creating local directory', repr(localdir)) - try: - makedir(localdir) - except OSError as msg: - print("Failed to establish local directory", repr(localdir)) - return - infofilename = os.path.join(localdir, '.mirrorinfo') - try: - text = open(infofilename, 'r').read() - except IOError as msg: - text = '{}' - try: - info = eval(text) - except (SyntaxError, NameError): - print('Bad mirror info in', repr(infofilename)) - info = {} - subdirs = [] - listing = [] - if verbose: print('Listing remote directory %r...' % (pwd,)) - f.retrlines('LIST', listing.append) - filesfound = [] - for line in listing: - if verbose > 1: print('-->', repr(line)) - if mac: - # Mac listing has just filenames; - # trailing / means subdirectory - filename = line.strip() - mode = '-' - if filename[-1:] == '/': - filename = filename[:-1] - mode = 'd' - infostuff = '' - else: - # Parse, assuming a UNIX listing - words = line.split(None, 8) - if len(words) < 6: - if verbose > 1: print('Skipping short line') - continue - filename = words[-1].lstrip() - i = filename.find(" -> ") - if i >= 0: - # words[0] had better start with 'l'... - if verbose > 1: - print('Found symbolic link %r' % (filename,)) - linkto = filename[i+4:] - filename = filename[:i] - infostuff = words[-5:-1] - mode = words[0] - skip = 0 - for pat in skippats: - if fnmatch(filename, pat): - if verbose > 1: - print('Skip pattern', repr(pat), end=' ') - print('matches', repr(filename)) - skip = 1 - break - if skip: - continue - if mode[0] == 'd': - if verbose > 1: - print('Remembering subdirectory', repr(filename)) - subdirs.append(filename) - continue - filesfound.append(filename) - if filename in info and info[filename] == infostuff: - if verbose > 1: - print('Already have this version of',repr(filename)) - continue - fullname = os.path.join(localdir, filename) - tempname = os.path.join(localdir, '@'+filename) - if interactive: - doit = askabout('file', filename, pwd) - if not doit: - if filename not in info: - info[filename] = 'Not retrieved' - continue - try: - os.unlink(tempname) - except OSError: - pass - if mode[0] == 'l': - if verbose: - print("Creating symlink %r -> %r" % (filename, linkto)) - try: - os.symlink(linkto, tempname) - except IOError as msg: - print("Can't create %r: %s" % (tempname, msg)) - continue - else: - try: - fp = open(tempname, 'wb') - except IOError as msg: - print("Can't create %r: %s" % (tempname, msg)) - continue - if verbose: - print('Retrieving %r from %r as %r...' % (filename, pwd, fullname)) - if verbose: - fp1 = LoggingFile(fp, 1024, sys.stdout) - else: - fp1 = fp - t0 = time.time() - try: - f.retrbinary('RETR ' + filename, - fp1.write, 8*1024) - except ftplib.error_perm as msg: - print(msg) - t1 = time.time() - bytes = fp.tell() - fp.close() - if fp1 != fp: - fp1.close() - try: - os.unlink(fullname) - except OSError: - pass # Ignore the error - try: - os.rename(tempname, fullname) - except OSError as msg: - print("Can't rename %r to %r: %s" % (tempname, fullname, msg)) - continue - info[filename] = infostuff - writedict(info, infofilename) - if verbose and mode[0] != 'l': - dt = t1 - t0 - kbytes = bytes / 1024.0 - print(int(round(kbytes)), end=' ') - print('Kbytes in', end=' ') - print(int(round(dt)), end=' ') - print('seconds', end=' ') - if t1 > t0: - print('(~%d Kbytes/sec)' % \ - int(round(kbytes/dt),)) - print() - # - # Remove files from info that are no longer remote - deletions = 0 - for filename in list(info.keys()): - if filename not in filesfound: - if verbose: - print("Removing obsolete info entry for", end=' ') - print(repr(filename), "in", repr(localdir or ".")) - del info[filename] - deletions = deletions + 1 - if deletions: - writedict(info, infofilename) - # - # Remove local files that are no longer in the remote directory - try: - if not localdir: names = os.listdir(os.curdir) - else: names = os.listdir(localdir) - except OSError: - names = [] - for name in names: - if name[0] == '.' or name in info or name in subdirs: - continue - skip = 0 - for pat in skippats: - if fnmatch(name, pat): - if verbose > 1: - print('Skip pattern', repr(pat), end=' ') - print('matches', repr(name)) - skip = 1 - break - if skip: - continue - fullname = os.path.join(localdir, name) - if not rmok: - if verbose: - print('Local file', repr(fullname), end=' ') - print('is no longer pertinent') - continue - if verbose: print('Removing local file/dir', repr(fullname)) - remove(fullname) - # - # Recursively mirror subdirectories - for subdir in subdirs: - if interactive: - doit = askabout('subdirectory', subdir, pwd) - if not doit: continue - if verbose: print('Processing subdirectory', repr(subdir)) - localsubdir = os.path.join(localdir, subdir) - pwd = f.pwd() - if verbose > 1: - print('Remote directory now:', repr(pwd)) - print('Remote cwd', repr(subdir)) - try: - f.cwd(subdir) - except ftplib.error_perm as msg: - print("Can't chdir to", repr(subdir), ":", repr(msg)) - else: - if verbose: print('Mirroring as', repr(localsubdir)) - mirrorsubdir(f, localsubdir) - if verbose > 1: print('Remote cwd ..') - f.cwd('..') - newpwd = f.pwd() - if newpwd != pwd: - print('Ended up in wrong directory after cd + cd ..') - print('Giving up now.') - break - else: - if verbose > 1: print('OK.') - -# Helper to remove a file or directory tree -def remove(fullname): - if os.path.isdir(fullname) and not os.path.islink(fullname): - try: - names = os.listdir(fullname) - except OSError: - names = [] - ok = 1 - for name in names: - if not remove(os.path.join(fullname, name)): - ok = 0 - if not ok: - return 0 - try: - os.rmdir(fullname) - except OSError as msg: - print("Can't remove local directory %r: %s" % (fullname, msg)) - return 0 - else: - try: - os.unlink(fullname) - except OSError as msg: - print("Can't remove local file %r: %s" % (fullname, msg)) - return 0 - return 1 - -# Wrapper around a file for writing to write a hash sign every block. -class LoggingFile: - def __init__(self, fp, blocksize, outfp): - self.fp = fp - self.bytes = 0 - self.hashes = 0 - self.blocksize = blocksize - self.outfp = outfp - def write(self, data): - self.bytes = self.bytes + len(data) - hashes = int(self.bytes) / self.blocksize - while hashes > self.hashes: - self.outfp.write('#') - self.outfp.flush() - self.hashes = self.hashes + 1 - self.fp.write(data) - def close(self): - self.outfp.write('\n') - -def raw_input(prompt): - sys.stdout.write(prompt) - sys.stdout.flush() - return sys.stdin.readline() - -# Ask permission to download a file. -def askabout(filetype, filename, pwd): - prompt = 'Retrieve %s %s from %s ? [ny] ' % (filetype, filename, pwd) - while 1: - reply = raw_input(prompt).strip().lower() - if reply in ['y', 'ye', 'yes']: - return 1 - if reply in ['', 'n', 'no', 'nop', 'nope']: - return 0 - print('Please answer yes or no.') - -# Create a directory if it doesn't exist. Recursively create the -# parent directory as well if needed. -def makedir(pathname): - if os.path.isdir(pathname): - return - dirname = os.path.dirname(pathname) - if dirname: makedir(dirname) - os.mkdir(pathname, 0o777) - -# Write a dictionary to a file in a way that can be read back using -# rval() but is still somewhat readable (i.e. not a single long line). -# Also creates a backup file. -def writedict(dict, filename): - dir, fname = os.path.split(filename) - tempname = os.path.join(dir, '@' + fname) - backup = os.path.join(dir, fname + '~') - try: - os.unlink(backup) - except OSError: - pass - fp = open(tempname, 'w') - fp.write('{\n') - for key, value in dict.items(): - fp.write('%r: %r,\n' % (key, value)) - fp.write('}\n') - fp.close() - try: - os.rename(filename, backup) - except OSError: - pass - os.rename(tempname, filename) - - -if __name__ == '__main__': - main() -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.2 -> 3.3): merge 3.2 (#23130)
by benjamin.peterson 30 Dec '14

30 Dec '14

https://hg.python.org/cpython/rev/e15d93926e47 changeset: 93986:e15d93926e47 branch: 3.3 parent: 93754:4a9418c6f8ae parent: 93985:223d0927e27d user: Benjamin Peterson <benjamin(a)python.org> date: Tue Dec 30 10:08:52 2014 -0600 summary: merge 3.2 (#23130) files: Tools/scripts/ftpmirror.py | 405 ------------------------- 1 files changed, 0 insertions(+), 405 deletions(-) diff --git a/Tools/scripts/ftpmirror.py b/Tools/scripts/ftpmirror.py deleted file mode 100755 --- a/Tools/scripts/ftpmirror.py +++ /dev/null @@ -1,405 +0,0 @@ -#! /usr/bin/env python3 - -"""Mirror a remote ftp subtree into a local directory tree. - -usage: ftpmirror [-v] [-q] [-i] [-m] [-n] [-r] [-s pat] - [-l username [-p passwd [-a account]]] - hostname[:port] [remotedir [localdir]] --v: verbose --q: quiet --i: interactive mode --m: macintosh server (NCSA telnet 2.4) (implies -n -s '*.o') --n: don't log in --r: remove local files/directories no longer pertinent --l username [-p passwd [-a account]]: login info (default .netrc or anonymous) --s pat: skip files matching pattern -hostname: remote host w/ optional port separated by ':' -remotedir: remote directory (default initial) -localdir: local directory (default current) -""" - -import os -import sys -import time -import getopt -import ftplib -import netrc -from fnmatch import fnmatch - -# Print usage message and exit -def usage(*args): - sys.stdout = sys.stderr - for msg in args: print(msg) - print(__doc__) - sys.exit(2) - -verbose = 1 # 0 for -q, 2 for -v -interactive = 0 -mac = 0 -rmok = 0 -nologin = 0 -skippats = ['.', '..', '.mirrorinfo'] - -# Main program: parse command line and start processing -def main(): - global verbose, interactive, mac, rmok, nologin - try: - opts, args = getopt.getopt(sys.argv[1:], 'a:bil:mnp:qrs:v') - except getopt.error as msg: - usage(msg) - login = '' - passwd = '' - account = '' - if not args: usage('hostname missing') - host = args[0] - port = 0 - if ':' in host: - host, port = host.split(':', 1) - port = int(port) - try: - auth = netrc.netrc().authenticators(host) - if auth is not None: - login, account, passwd = auth - except (netrc.NetrcParseError, IOError): - pass - for o, a in opts: - if o == '-l': login = a - if o == '-p': passwd = a - if o == '-a': account = a - if o == '-v': verbose = verbose + 1 - if o == '-q': verbose = 0 - if o == '-i': interactive = 1 - if o == '-m': mac = 1; nologin = 1; skippats.append('*.o') - if o == '-n': nologin = 1 - if o == '-r': rmok = 1 - if o == '-s': skippats.append(a) - remotedir = '' - localdir = '' - if args[1:]: - remotedir = args[1] - if args[2:]: - localdir = args[2] - if args[3:]: usage('too many arguments') - # - f = ftplib.FTP() - if verbose: print("Connecting to '%s%s'..." % (host, - (port and ":%d"%port or ""))) - f.connect(host,port) - if not nologin: - if verbose: - print('Logging in as %r...' % (login or 'anonymous')) - f.login(login, passwd, account) - if verbose: print('OK.') - pwd = f.pwd() - if verbose > 1: print('PWD =', repr(pwd)) - if remotedir: - if verbose > 1: print('cwd(%s)' % repr(remotedir)) - f.cwd(remotedir) - if verbose > 1: print('OK.') - pwd = f.pwd() - if verbose > 1: print('PWD =', repr(pwd)) - # - mirrorsubdir(f, localdir) - -# Core logic: mirror one subdirectory (recursively) -def mirrorsubdir(f, localdir): - pwd = f.pwd() - if localdir and not os.path.isdir(localdir): - if verbose: print('Creating local directory', repr(localdir)) - try: - makedir(localdir) - except os.error as msg: - print("Failed to establish local directory", repr(localdir)) - return - infofilename = os.path.join(localdir, '.mirrorinfo') - try: - text = open(infofilename, 'r').read() - except IOError as msg: - text = '{}' - try: - info = eval(text) - except (SyntaxError, NameError): - print('Bad mirror info in', repr(infofilename)) - info = {} - subdirs = [] - listing = [] - if verbose: print('Listing remote directory %r...' % (pwd,)) - f.retrlines('LIST', listing.append) - filesfound = [] - for line in listing: - if verbose > 1: print('-->', repr(line)) - if mac: - # Mac listing has just filenames; - # trailing / means subdirectory - filename = line.strip() - mode = '-' - if filename[-1:] == '/': - filename = filename[:-1] - mode = 'd' - infostuff = '' - else: - # Parse, assuming a UNIX listing - words = line.split(None, 8) - if len(words) < 6: - if verbose > 1: print('Skipping short line') - continue - filename = words[-1].lstrip() - i = filename.find(" -> ") - if i >= 0: - # words[0] had better start with 'l'... - if verbose > 1: - print('Found symbolic link %r' % (filename,)) - linkto = filename[i+4:] - filename = filename[:i] - infostuff = words[-5:-1] - mode = words[0] - skip = 0 - for pat in skippats: - if fnmatch(filename, pat): - if verbose > 1: - print('Skip pattern', repr(pat), end=' ') - print('matches', repr(filename)) - skip = 1 - break - if skip: - continue - if mode[0] == 'd': - if verbose > 1: - print('Remembering subdirectory', repr(filename)) - subdirs.append(filename) - continue - filesfound.append(filename) - if filename in info and info[filename] == infostuff: - if verbose > 1: - print('Already have this version of',repr(filename)) - continue - fullname = os.path.join(localdir, filename) - tempname = os.path.join(localdir, '@'+filename) - if interactive: - doit = askabout('file', filename, pwd) - if not doit: - if filename not in info: - info[filename] = 'Not retrieved' - continue - try: - os.unlink(tempname) - except os.error: - pass - if mode[0] == 'l': - if verbose: - print("Creating symlink %r -> %r" % (filename, linkto)) - try: - os.symlink(linkto, tempname) - except IOError as msg: - print("Can't create %r: %s" % (tempname, msg)) - continue - else: - try: - fp = open(tempname, 'wb') - except IOError as msg: - print("Can't create %r: %s" % (tempname, msg)) - continue - if verbose: - print('Retrieving %r from %r as %r...' % (filename, pwd, fullname)) - if verbose: - fp1 = LoggingFile(fp, 1024, sys.stdout) - else: - fp1 = fp - t0 = time.time() - try: - f.retrbinary('RETR ' + filename, - fp1.write, 8*1024) - except ftplib.error_perm as msg: - print(msg) - t1 = time.time() - bytes = fp.tell() - fp.close() - if fp1 != fp: - fp1.close() - try: - os.unlink(fullname) - except os.error: - pass # Ignore the error - try: - os.rename(tempname, fullname) - except os.error as msg: - print("Can't rename %r to %r: %s" % (tempname, fullname, msg)) - continue - info[filename] = infostuff - writedict(info, infofilename) - if verbose and mode[0] != 'l': - dt = t1 - t0 - kbytes = bytes / 1024.0 - print(int(round(kbytes)), end=' ') - print('Kbytes in', end=' ') - print(int(round(dt)), end=' ') - print('seconds', end=' ') - if t1 > t0: - print('(~%d Kbytes/sec)' % \ - int(round(kbytes/dt),)) - print() - # - # Remove files from info that are no longer remote - deletions = 0 - for filename in list(info.keys()): - if filename not in filesfound: - if verbose: - print("Removing obsolete info entry for", end=' ') - print(repr(filename), "in", repr(localdir or ".")) - del info[filename] - deletions = deletions + 1 - if deletions: - writedict(info, infofilename) - # - # Remove local files that are no longer in the remote directory - try: - if not localdir: names = os.listdir(os.curdir) - else: names = os.listdir(localdir) - except os.error: - names = [] - for name in names: - if name[0] == '.' or name in info or name in subdirs: - continue - skip = 0 - for pat in skippats: - if fnmatch(name, pat): - if verbose > 1: - print('Skip pattern', repr(pat), end=' ') - print('matches', repr(name)) - skip = 1 - break - if skip: - continue - fullname = os.path.join(localdir, name) - if not rmok: - if verbose: - print('Local file', repr(fullname), end=' ') - print('is no longer pertinent') - continue - if verbose: print('Removing local file/dir', repr(fullname)) - remove(fullname) - # - # Recursively mirror subdirectories - for subdir in subdirs: - if interactive: - doit = askabout('subdirectory', subdir, pwd) - if not doit: continue - if verbose: print('Processing subdirectory', repr(subdir)) - localsubdir = os.path.join(localdir, subdir) - pwd = f.pwd() - if verbose > 1: - print('Remote directory now:', repr(pwd)) - print('Remote cwd', repr(subdir)) - try: - f.cwd(subdir) - except ftplib.error_perm as msg: - print("Can't chdir to", repr(subdir), ":", repr(msg)) - else: - if verbose: print('Mirroring as', repr(localsubdir)) - mirrorsubdir(f, localsubdir) - if verbose > 1: print('Remote cwd ..') - f.cwd('..') - newpwd = f.pwd() - if newpwd != pwd: - print('Ended up in wrong directory after cd + cd ..') - print('Giving up now.') - break - else: - if verbose > 1: print('OK.') - -# Helper to remove a file or directory tree -def remove(fullname): - if os.path.isdir(fullname) and not os.path.islink(fullname): - try: - names = os.listdir(fullname) - except os.error: - names = [] - ok = 1 - for name in names: - if not remove(os.path.join(fullname, name)): - ok = 0 - if not ok: - return 0 - try: - os.rmdir(fullname) - except os.error as msg: - print("Can't remove local directory %r: %s" % (fullname, msg)) - return 0 - else: - try: - os.unlink(fullname) - except os.error as msg: - print("Can't remove local file %r: %s" % (fullname, msg)) - return 0 - return 1 - -# Wrapper around a file for writing to write a hash sign every block. -class LoggingFile: - def __init__(self, fp, blocksize, outfp): - self.fp = fp - self.bytes = 0 - self.hashes = 0 - self.blocksize = blocksize - self.outfp = outfp - def write(self, data): - self.bytes = self.bytes + len(data) - hashes = int(self.bytes) / self.blocksize - while hashes > self.hashes: - self.outfp.write('#') - self.outfp.flush() - self.hashes = self.hashes + 1 - self.fp.write(data) - def close(self): - self.outfp.write('\n') - -def raw_input(prompt): - sys.stdout.write(prompt) - sys.stdout.flush() - return sys.stdin.readline() - -# Ask permission to download a file. -def askabout(filetype, filename, pwd): - prompt = 'Retrieve %s %s from %s ? [ny] ' % (filetype, filename, pwd) - while 1: - reply = raw_input(prompt).strip().lower() - if reply in ['y', 'ye', 'yes']: - return 1 - if reply in ['', 'n', 'no', 'nop', 'nope']: - return 0 - print('Please answer yes or no.') - -# Create a directory if it doesn't exist. Recursively create the -# parent directory as well if needed. -def makedir(pathname): - if os.path.isdir(pathname): - return - dirname = os.path.dirname(pathname) - if dirname: makedir(dirname) - os.mkdir(pathname, 0o777) - -# Write a dictionary to a file in a way that can be read back using -# rval() but is still somewhat readable (i.e. not a single long line). -# Also creates a backup file. -def writedict(dict, filename): - dir, fname = os.path.split(filename) - tempname = os.path.join(dir, '@' + fname) - backup = os.path.join(dir, fname + '~') - try: - os.unlink(backup) - except os.error: - pass - fp = open(tempname, 'w') - fp.write('{\n') - for key, value in dict.items(): - fp.write('%r: %r,\n' % (key, value)) - fp.write('}\n') - fp.close() - try: - os.rename(filename, backup) - except os.error: - pass - os.rename(tempname, filename) - - -if __name__ == '__main__': - main() -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.3 -> 3.4): merge 3.3 (#23130)
by benjamin.peterson 30 Dec '14

30 Dec '14

https://hg.python.org/cpython/rev/483746c32296 changeset: 93987:483746c32296 branch: 3.4 parent: 93982:1e4aa3724915 parent: 93986:e15d93926e47 user: Benjamin Peterson <benjamin(a)python.org> date: Tue Dec 30 10:09:17 2014 -0600 summary: merge 3.3 (#23130) files: Tools/scripts/ftpmirror.py | 405 ------------------------- 1 files changed, 0 insertions(+), 405 deletions(-) diff --git a/Tools/scripts/ftpmirror.py b/Tools/scripts/ftpmirror.py deleted file mode 100755 --- a/Tools/scripts/ftpmirror.py +++ /dev/null @@ -1,405 +0,0 @@ -#! /usr/bin/env python3 - -"""Mirror a remote ftp subtree into a local directory tree. - -usage: ftpmirror [-v] [-q] [-i] [-m] [-n] [-r] [-s pat] - [-l username [-p passwd [-a account]]] - hostname[:port] [remotedir [localdir]] --v: verbose --q: quiet --i: interactive mode --m: macintosh server (NCSA telnet 2.4) (implies -n -s '*.o') --n: don't log in --r: remove local files/directories no longer pertinent --l username [-p passwd [-a account]]: login info (default .netrc or anonymous) --s pat: skip files matching pattern -hostname: remote host w/ optional port separated by ':' -remotedir: remote directory (default initial) -localdir: local directory (default current) -""" - -import os -import sys -import time -import getopt -import ftplib -import netrc -from fnmatch import fnmatch - -# Print usage message and exit -def usage(*args): - sys.stdout = sys.stderr - for msg in args: print(msg) - print(__doc__) - sys.exit(2) - -verbose = 1 # 0 for -q, 2 for -v -interactive = 0 -mac = 0 -rmok = 0 -nologin = 0 -skippats = ['.', '..', '.mirrorinfo'] - -# Main program: parse command line and start processing -def main(): - global verbose, interactive, mac, rmok, nologin - try: - opts, args = getopt.getopt(sys.argv[1:], 'a:bil:mnp:qrs:v') - except getopt.error as msg: - usage(msg) - login = '' - passwd = '' - account = '' - if not args: usage('hostname missing') - host = args[0] - port = 0 - if ':' in host: - host, port = host.split(':', 1) - port = int(port) - try: - auth = netrc.netrc().authenticators(host) - if auth is not None: - login, account, passwd = auth - except (netrc.NetrcParseError, IOError): - pass - for o, a in opts: - if o == '-l': login = a - if o == '-p': passwd = a - if o == '-a': account = a - if o == '-v': verbose = verbose + 1 - if o == '-q': verbose = 0 - if o == '-i': interactive = 1 - if o == '-m': mac = 1; nologin = 1; skippats.append('*.o') - if o == '-n': nologin = 1 - if o == '-r': rmok = 1 - if o == '-s': skippats.append(a) - remotedir = '' - localdir = '' - if args[1:]: - remotedir = args[1] - if args[2:]: - localdir = args[2] - if args[3:]: usage('too many arguments') - # - f = ftplib.FTP() - if verbose: print("Connecting to '%s%s'..." % (host, - (port and ":%d"%port or ""))) - f.connect(host,port) - if not nologin: - if verbose: - print('Logging in as %r...' % (login or 'anonymous')) - f.login(login, passwd, account) - if verbose: print('OK.') - pwd = f.pwd() - if verbose > 1: print('PWD =', repr(pwd)) - if remotedir: - if verbose > 1: print('cwd(%s)' % repr(remotedir)) - f.cwd(remotedir) - if verbose > 1: print('OK.') - pwd = f.pwd() - if verbose > 1: print('PWD =', repr(pwd)) - # - mirrorsubdir(f, localdir) - -# Core logic: mirror one subdirectory (recursively) -def mirrorsubdir(f, localdir): - pwd = f.pwd() - if localdir and not os.path.isdir(localdir): - if verbose: print('Creating local directory', repr(localdir)) - try: - makedir(localdir) - except OSError as msg: - print("Failed to establish local directory", repr(localdir)) - return - infofilename = os.path.join(localdir, '.mirrorinfo') - try: - text = open(infofilename, 'r').read() - except IOError as msg: - text = '{}' - try: - info = eval(text) - except (SyntaxError, NameError): - print('Bad mirror info in', repr(infofilename)) - info = {} - subdirs = [] - listing = [] - if verbose: print('Listing remote directory %r...' % (pwd,)) - f.retrlines('LIST', listing.append) - filesfound = [] - for line in listing: - if verbose > 1: print('-->', repr(line)) - if mac: - # Mac listing has just filenames; - # trailing / means subdirectory - filename = line.strip() - mode = '-' - if filename[-1:] == '/': - filename = filename[:-1] - mode = 'd' - infostuff = '' - else: - # Parse, assuming a UNIX listing - words = line.split(None, 8) - if len(words) < 6: - if verbose > 1: print('Skipping short line') - continue - filename = words[-1].lstrip() - i = filename.find(" -> ") - if i >= 0: - # words[0] had better start with 'l'... - if verbose > 1: - print('Found symbolic link %r' % (filename,)) - linkto = filename[i+4:] - filename = filename[:i] - infostuff = words[-5:-1] - mode = words[0] - skip = 0 - for pat in skippats: - if fnmatch(filename, pat): - if verbose > 1: - print('Skip pattern', repr(pat), end=' ') - print('matches', repr(filename)) - skip = 1 - break - if skip: - continue - if mode[0] == 'd': - if verbose > 1: - print('Remembering subdirectory', repr(filename)) - subdirs.append(filename) - continue - filesfound.append(filename) - if filename in info and info[filename] == infostuff: - if verbose > 1: - print('Already have this version of',repr(filename)) - continue - fullname = os.path.join(localdir, filename) - tempname = os.path.join(localdir, '@'+filename) - if interactive: - doit = askabout('file', filename, pwd) - if not doit: - if filename not in info: - info[filename] = 'Not retrieved' - continue - try: - os.unlink(tempname) - except OSError: - pass - if mode[0] == 'l': - if verbose: - print("Creating symlink %r -> %r" % (filename, linkto)) - try: - os.symlink(linkto, tempname) - except IOError as msg: - print("Can't create %r: %s" % (tempname, msg)) - continue - else: - try: - fp = open(tempname, 'wb') - except IOError as msg: - print("Can't create %r: %s" % (tempname, msg)) - continue - if verbose: - print('Retrieving %r from %r as %r...' % (filename, pwd, fullname)) - if verbose: - fp1 = LoggingFile(fp, 1024, sys.stdout) - else: - fp1 = fp - t0 = time.time() - try: - f.retrbinary('RETR ' + filename, - fp1.write, 8*1024) - except ftplib.error_perm as msg: - print(msg) - t1 = time.time() - bytes = fp.tell() - fp.close() - if fp1 != fp: - fp1.close() - try: - os.unlink(fullname) - except OSError: - pass # Ignore the error - try: - os.rename(tempname, fullname) - except OSError as msg: - print("Can't rename %r to %r: %s" % (tempname, fullname, msg)) - continue - info[filename] = infostuff - writedict(info, infofilename) - if verbose and mode[0] != 'l': - dt = t1 - t0 - kbytes = bytes / 1024.0 - print(int(round(kbytes)), end=' ') - print('Kbytes in', end=' ') - print(int(round(dt)), end=' ') - print('seconds', end=' ') - if t1 > t0: - print('(~%d Kbytes/sec)' % \ - int(round(kbytes/dt),)) - print() - # - # Remove files from info that are no longer remote - deletions = 0 - for filename in list(info.keys()): - if filename not in filesfound: - if verbose: - print("Removing obsolete info entry for", end=' ') - print(repr(filename), "in", repr(localdir or ".")) - del info[filename] - deletions = deletions + 1 - if deletions: - writedict(info, infofilename) - # - # Remove local files that are no longer in the remote directory - try: - if not localdir: names = os.listdir(os.curdir) - else: names = os.listdir(localdir) - except OSError: - names = [] - for name in names: - if name[0] == '.' or name in info or name in subdirs: - continue - skip = 0 - for pat in skippats: - if fnmatch(name, pat): - if verbose > 1: - print('Skip pattern', repr(pat), end=' ') - print('matches', repr(name)) - skip = 1 - break - if skip: - continue - fullname = os.path.join(localdir, name) - if not rmok: - if verbose: - print('Local file', repr(fullname), end=' ') - print('is no longer pertinent') - continue - if verbose: print('Removing local file/dir', repr(fullname)) - remove(fullname) - # - # Recursively mirror subdirectories - for subdir in subdirs: - if interactive: - doit = askabout('subdirectory', subdir, pwd) - if not doit: continue - if verbose: print('Processing subdirectory', repr(subdir)) - localsubdir = os.path.join(localdir, subdir) - pwd = f.pwd() - if verbose > 1: - print('Remote directory now:', repr(pwd)) - print('Remote cwd', repr(subdir)) - try: - f.cwd(subdir) - except ftplib.error_perm as msg: - print("Can't chdir to", repr(subdir), ":", repr(msg)) - else: - if verbose: print('Mirroring as', repr(localsubdir)) - mirrorsubdir(f, localsubdir) - if verbose > 1: print('Remote cwd ..') - f.cwd('..') - newpwd = f.pwd() - if newpwd != pwd: - print('Ended up in wrong directory after cd + cd ..') - print('Giving up now.') - break - else: - if verbose > 1: print('OK.') - -# Helper to remove a file or directory tree -def remove(fullname): - if os.path.isdir(fullname) and not os.path.islink(fullname): - try: - names = os.listdir(fullname) - except OSError: - names = [] - ok = 1 - for name in names: - if not remove(os.path.join(fullname, name)): - ok = 0 - if not ok: - return 0 - try: - os.rmdir(fullname) - except OSError as msg: - print("Can't remove local directory %r: %s" % (fullname, msg)) - return 0 - else: - try: - os.unlink(fullname) - except OSError as msg: - print("Can't remove local file %r: %s" % (fullname, msg)) - return 0 - return 1 - -# Wrapper around a file for writing to write a hash sign every block. -class LoggingFile: - def __init__(self, fp, blocksize, outfp): - self.fp = fp - self.bytes = 0 - self.hashes = 0 - self.blocksize = blocksize - self.outfp = outfp - def write(self, data): - self.bytes = self.bytes + len(data) - hashes = int(self.bytes) / self.blocksize - while hashes > self.hashes: - self.outfp.write('#') - self.outfp.flush() - self.hashes = self.hashes + 1 - self.fp.write(data) - def close(self): - self.outfp.write('\n') - -def raw_input(prompt): - sys.stdout.write(prompt) - sys.stdout.flush() - return sys.stdin.readline() - -# Ask permission to download a file. -def askabout(filetype, filename, pwd): - prompt = 'Retrieve %s %s from %s ? [ny] ' % (filetype, filename, pwd) - while 1: - reply = raw_input(prompt).strip().lower() - if reply in ['y', 'ye', 'yes']: - return 1 - if reply in ['', 'n', 'no', 'nop', 'nope']: - return 0 - print('Please answer yes or no.') - -# Create a directory if it doesn't exist. Recursively create the -# parent directory as well if needed. -def makedir(pathname): - if os.path.isdir(pathname): - return - dirname = os.path.dirname(pathname) - if dirname: makedir(dirname) - os.mkdir(pathname, 0o777) - -# Write a dictionary to a file in a way that can be read back using -# rval() but is still somewhat readable (i.e. not a single long line). -# Also creates a backup file. -def writedict(dict, filename): - dir, fname = os.path.split(filename) - tempname = os.path.join(dir, '@' + fname) - backup = os.path.join(dir, fname + '~') - try: - os.unlink(backup) - except OSError: - pass - fp = open(tempname, 'w') - fp.write('{\n') - for key, value in dict.items(): - fp.write('%r: %r,\n' % (key, value)) - fp.write('}\n') - fp.close() - try: - os.rename(filename, backup) - except OSError: - pass - os.rename(tempname, filename) - - -if __name__ == '__main__': - main() -- Repository URL: https://hg.python.org/cpython

1 0