mirror of
https://github.com/python/cpython.git
synced 2025-09-18 22:50:26 +00:00
Fix a number of typos in strings and comments (sf#1589070)
This commit is contained in:
parent
3230599329
commit
aa56096aa0
1 changed files with 12 additions and 13 deletions
|
@ -33,7 +33,7 @@ except ImportError:
|
||||||
|
|
||||||
def shellQuote(value):
|
def shellQuote(value):
|
||||||
"""
|
"""
|
||||||
Return the string value in a form that can savely be inserted into
|
Return the string value in a form that can safely be inserted into
|
||||||
a shell command.
|
a shell command.
|
||||||
"""
|
"""
|
||||||
return "'%s'"%(value.replace("'", "'\"'\"'"))
|
return "'%s'"%(value.replace("'", "'\"'\"'"))
|
||||||
|
@ -56,10 +56,10 @@ def getFullVersion():
|
||||||
|
|
||||||
raise RuntimeError, "Cannot find full version??"
|
raise RuntimeError, "Cannot find full version??"
|
||||||
|
|
||||||
# The directory we'll use to create the build, will be erased and recreated
|
# The directory we'll use to create the build (will be erased and recreated)
|
||||||
WORKDIR="/tmp/_py"
|
WORKDIR="/tmp/_py"
|
||||||
|
|
||||||
# The directory we'll use to store third-party sources, set this to something
|
# The directory we'll use to store third-party sources. Set this to something
|
||||||
# else if you don't want to re-fetch required libraries every time.
|
# else if you don't want to re-fetch required libraries every time.
|
||||||
DEPSRC=os.path.join(WORKDIR, 'third-party')
|
DEPSRC=os.path.join(WORKDIR, 'third-party')
|
||||||
DEPSRC=os.path.expanduser('~/Universal/other-sources')
|
DEPSRC=os.path.expanduser('~/Universal/other-sources')
|
||||||
|
@ -201,7 +201,7 @@ PKG_RECIPES=[
|
||||||
long_name="GUI Applications",
|
long_name="GUI Applications",
|
||||||
source="/Applications/MacPython %(VER)s",
|
source="/Applications/MacPython %(VER)s",
|
||||||
readme="""\
|
readme="""\
|
||||||
This package installs IDLE (an interactive Python IDLE),
|
This package installs IDLE (an interactive Python IDE),
|
||||||
Python Launcher and Build Applet (create application bundles
|
Python Launcher and Build Applet (create application bundles
|
||||||
from python scripts).
|
from python scripts).
|
||||||
|
|
||||||
|
@ -257,8 +257,7 @@ PKG_RECIPES=[
|
||||||
readme="""\
|
readme="""\
|
||||||
This package updates the system python installation on
|
This package updates the system python installation on
|
||||||
Mac OS X 10.3 to ensure that you can build new python extensions
|
Mac OS X 10.3 to ensure that you can build new python extensions
|
||||||
using that copy of python after installing this version of
|
using that copy of python after installing this version.
|
||||||
python.
|
|
||||||
""",
|
""",
|
||||||
postflight="../Tools/fixapplepython23.py",
|
postflight="../Tools/fixapplepython23.py",
|
||||||
topdir="/Library/Frameworks/Python.framework",
|
topdir="/Library/Frameworks/Python.framework",
|
||||||
|
@ -637,15 +636,15 @@ def buildPython():
|
||||||
print "Running make"
|
print "Running make"
|
||||||
runCommand("make")
|
runCommand("make")
|
||||||
|
|
||||||
print "Runing make frameworkinstall"
|
print "Running make frameworkinstall"
|
||||||
runCommand("make frameworkinstall DESTDIR=%s"%(
|
runCommand("make frameworkinstall DESTDIR=%s"%(
|
||||||
shellQuote(rootDir)))
|
shellQuote(rootDir)))
|
||||||
|
|
||||||
print "Runing make frameworkinstallextras"
|
print "Running make frameworkinstallextras"
|
||||||
runCommand("make frameworkinstallextras DESTDIR=%s"%(
|
runCommand("make frameworkinstallextras DESTDIR=%s"%(
|
||||||
shellQuote(rootDir)))
|
shellQuote(rootDir)))
|
||||||
|
|
||||||
print "Copy required shared libraries"
|
print "Copying required shared libraries"
|
||||||
if os.path.exists(os.path.join(WORKDIR, 'libraries', 'Library')):
|
if os.path.exists(os.path.join(WORKDIR, 'libraries', 'Library')):
|
||||||
runCommand("mv %s/* %s"%(
|
runCommand("mv %s/* %s"%(
|
||||||
shellQuote(os.path.join(
|
shellQuote(os.path.join(
|
||||||
|
@ -735,8 +734,8 @@ def patchScript(inPath, outPath):
|
||||||
def packageFromRecipe(targetDir, recipe):
|
def packageFromRecipe(targetDir, recipe):
|
||||||
curdir = os.getcwd()
|
curdir = os.getcwd()
|
||||||
try:
|
try:
|
||||||
# The major version (such as 2.5) is included in the pacakge name
|
# The major version (such as 2.5) is included in the package name
|
||||||
# because haveing two version of python installed at the same time is
|
# because having two version of python installed at the same time is
|
||||||
# common.
|
# common.
|
||||||
pkgname = '%s-%s'%(recipe['name'], getVersion())
|
pkgname = '%s-%s'%(recipe['name'], getVersion())
|
||||||
srcdir = recipe.get('source')
|
srcdir = recipe.get('source')
|
||||||
|
@ -910,7 +909,7 @@ def installSize(clear=False, _saved=[]):
|
||||||
|
|
||||||
def buildDMG():
|
def buildDMG():
|
||||||
"""
|
"""
|
||||||
Create DMG containing the rootDir
|
Create DMG containing the rootDir.
|
||||||
"""
|
"""
|
||||||
outdir = os.path.join(WORKDIR, 'diskimage')
|
outdir = os.path.join(WORKDIR, 'diskimage')
|
||||||
if os.path.exists(outdir):
|
if os.path.exists(outdir):
|
||||||
|
@ -923,7 +922,7 @@ def buildDMG():
|
||||||
imagepath = imagepath + '.dmg'
|
imagepath = imagepath + '.dmg'
|
||||||
|
|
||||||
os.mkdir(outdir)
|
os.mkdir(outdir)
|
||||||
runCommand("hdiutil create -volname 'Univeral MacPython %s' -srcfolder %s %s"%(
|
runCommand("hdiutil create -volname 'Universal MacPython %s' -srcfolder %s %s"%(
|
||||||
getFullVersion(),
|
getFullVersion(),
|
||||||
shellQuote(os.path.join(WORKDIR, 'installer')),
|
shellQuote(os.path.join(WORKDIR, 'installer')),
|
||||||
shellQuote(imagepath)))
|
shellQuote(imagepath)))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue