mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 19:34:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merged revisions 69415,69591,69593 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69415 | benjamin.peterson | 2009-02-07 13:08:22 -0600 (Sat, 07 Feb 2009) | 1 line

  make destinsrc private
........
  r69591 | martin.v.loewis | 2009-02-13 14:26:16 -0600 (Fri, 13 Feb 2009) | 1 line

  Update Tix build procedure.
........
  r69593 | martin.v.loewis | 2009-02-13 14:51:48 -0600 (Fri, 13 Feb 2009) | 1 line

  Add optional code signing after merging.
........
This commit is contained in:
Benjamin Peterson 2009-02-20 04:09:19 +00:00
parent ba01dd93d2
commit 247a9b87bd
4 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/shutil.py
View file

@ -256,7 +256,7 @@ def move(src, dst):
os.rename(src, real_dst)
except OSError:
if os.path.isdir(src):
if destinsrc(src, dst):
if _destinsrc(src, dst):
raise Error("Cannot move a directory '%s' into itself '%s'." % (src, dst))
copytree(src, real_dst, symlinks=True)
rmtree(src)
@ -264,7 +264,7 @@ def move(src, dst):
copy2(src, real_dst)
os.unlink(src)
def destinsrc(src, dst):
def _destinsrc(src, dst):
src = abspath(src)
dst = abspath(dst)
if not src.endswith(os.path.sep):

8
Lib/test/test_shutil.py
View file

@ -346,8 +346,8 @@ class TestMove(unittest.TestCase):
for src, dst in [('srcdir', 'srcdir/dest')]:
src = os.path.join(TESTFN, src)
dst = os.path.join(TESTFN, dst)
self.assert_(shutil.destinsrc(src, dst),
msg='destinsrc() wrongly concluded that '
self.assert_(shutil._destinsrc(src, dst),
msg='_destinsrc() wrongly concluded that '
'dst (%s) is not in src (%s)' % (dst, src))
finally:
shutil.rmtree(TESTFN, ignore_errors=True)
@ -358,8 +358,8 @@ class TestMove(unittest.TestCase):
for src, dst in [('srcdir', 'src/dest'), ('srcdir', 'srcdir.new')]:
src = os.path.join(TESTFN, src)
dst = os.path.join(TESTFN, dst)
self.failIf(shutil.destinsrc(src, dst),
msg='destinsrc() wrongly concluded that '
self.failIf(shutil._destinsrc(src, dst),
msg='_destinsrc() wrongly concluded that '
'dst (%s) is in src (%s)' % (dst, src))
finally:
shutil.rmtree(TESTFN, ignore_errors=True)

12
PCbuild/build_tkinter.py
View file

@ -52,18 +52,18 @@ def build(platform, clean):
if 1:
os.chdir(os.path.join(ROOT, TK, "win"))
if clean:
nmake("makefile.vc", "clean", TCLDIR=tcldir)
nmake("makefile.vc", TCLDIR=tcldir, MACHINE=machine)
nmake("makefile.vc", "install", TCLDIR=tcldir, INSTALLDIR=dest, MACHINE=machine)
nmake("makefile.vc", "clean", DEBUG=0, TCLDIR=tcldir)
nmake("makefile.vc", DEBUG=0, MACHINE=machine)
nmake("makefile.vc", "install", DEBUG=0, INSTALLDIR=dest, MACHINE=machine)
# TIX
if 1:
# python9.mak is available at http://svn.python.org
os.chdir(os.path.join(ROOT, TIX, "win"))
if clean:
nmake("python9.mak", "clean")
nmake("python9.mak", MACHINE=machine, INSTALL_DIR=dest)
nmake("python9.mak", "install", INSTALL_DIR=dest)
nmake("python.mak", "clean")
nmake("python.mak", MACHINE=machine, INSTALL_DIR=dest)
nmake("python.mak", "install", INSTALL_DIR=dest)
def main():
if len(sys.argv) < 2 or sys.argv[1] not in ("Win32", "AMD64"):

6
Tools/msi/merge.py
View file

@ -1,5 +1,6 @@
import msilib,os,win32com,tempfile,sys
PCBUILD="PCBuild"
certname = None
from config import *
Win64 = "amd64" in PCBUILD
@ -76,3 +77,8 @@ def merge(msi, feature, rootdir, modules):
db.Commit()
merge(msi, "SharedCRT", "TARGETDIR", modules)
# certname (from config.py) should be (a substring of)
# the certificate subject, e.g. "Python Software Foundation"
if certname:
os.system('signtool sign /n "%s" /t http://timestamp.verisign.com/scripts/timestamp.dll %s' % (certname, msi))