Commit 54050dd
ronald.oussoren
Fix a number of typos in strings and comments (sf#1589070)
git-svn-id: http://svn.python.org/projects/python/trunk@52644 6015fed2-1504-0410-9fe1-9d1591cc47711 parent 7e8be15 commit 54050dd
1 file changed
Lines changed: 12 additions & 13 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -33,7 +33,7 @@ def writePlist(plist, path): | |||
| 33 | 33 | ||
| 34 | 34 | def shellQuote(value): | |
| 35 | 35 | """ | |
| 36 | - Return the string value in a form that can savely be inserted into | ||
| 36 | + Return the string value in a form that can safely be inserted into | ||
| 37 | 37 | a shell command. | |
| 38 | 38 | """ | |
| 39 | 39 | return "'%s'"%(value.replace("'", "'\"'\"'")) | |
@@ -56,10 +56,10 @@ def getFullVersion(): | |||
| 56 | 56 | ||
| 57 | 57 | raise RuntimeError, "Cannot find full version??" | |
| 58 | 58 | ||
| 59 | - # The directory we'll use to create the build, will be erased and recreated | ||
| 59 | + # The directory we'll use to create the build (will be erased and recreated) | ||
| 60 | 60 | WORKDIR="/tmp/_py" | |
| 61 | 61 | ||
| 62 | - # The directory we'll use to store third-party sources, set this to something | ||
| 62 | + # The directory we'll use to store third-party sources. Set this to something | ||
| 63 | 63 | # else if you don't want to re-fetch required libraries every time. | |
| 64 | 64 | DEPSRC=os.path.join(WORKDIR, 'third-party') | |
| 65 | 65 | DEPSRC=os.path.expanduser('~/Universal/other-sources') | |
@@ -201,7 +201,7 @@ def getFullVersion(): | |||
| 201 | 201 | long_name="GUI Applications", | |
| 202 | 202 | source="/Applications/MacPython %(VER)s", | |
| 203 | 203 | readme="""\ | |
| 204 | - This package installs IDLE (an interactive Python IDLE), | ||
| 204 | + This package installs IDLE (an interactive Python IDE), | ||
| 205 | 205 | Python Launcher and Build Applet (create application bundles | |
| 206 | 206 | from python scripts). | |
| 207 | 207 | ||
@@ -257,8 +257,7 @@ def getFullVersion(): | |||
| 257 | 257 | readme="""\ | |
| 258 | 258 | This package updates the system python installation on | |
| 259 | 259 | Mac OS X 10.3 to ensure that you can build new python extensions | |
| 260 | - using that copy of python after installing this version of | ||
| 261 | - python. | ||
| 260 | + using that copy of python after installing this version. | ||
| 262 | 261 | """, | |
| 263 | 262 | postflight="../Tools/fixapplepython23.py", | |
| 264 | 263 | topdir="/Library/Frameworks/Python.framework", | |
@@ -637,15 +636,15 @@ def buildPython(): | |||
| 637 | 636 | print "Running make" | |
| 638 | 637 | runCommand("make") | |
| 639 | 638 | ||
| 640 | - print "Runing make frameworkinstall" | ||
| 639 | + print "Running make frameworkinstall" | ||
| 641 | 640 | runCommand("make frameworkinstall DESTDIR=%s"%( | |
| 642 | 641 | shellQuote(rootDir))) | |
| 643 | 642 | ||
| 644 | - print "Runing make frameworkinstallextras" | ||
| 643 | + print "Running make frameworkinstallextras" | ||
| 645 | 644 | runCommand("make frameworkinstallextras DESTDIR=%s"%( | |
| 646 | 645 | shellQuote(rootDir))) | |
| 647 | 646 | ||
| 648 | - print "Copy required shared libraries" | ||
| 647 | + print "Copying required shared libraries" | ||
| 649 | 648 | if os.path.exists(os.path.join(WORKDIR, 'libraries', 'Library')): | |
| 650 | 649 | runCommand("mv %s/* %s"%( | |
| 651 | 650 | shellQuote(os.path.join( | |
@@ -735,8 +734,8 @@ def patchScript(inPath, outPath): | |||
| 735 | 734 | def packageFromRecipe(targetDir, recipe): | |
| 736 | 735 | curdir = os.getcwd() | |
| 737 | 736 | try: | |
| 738 | - # The major version (such as 2.5) is included in the pacakge name | ||
| 739 | - # because haveing two version of python installed at the same time is | ||
| 737 | + # The major version (such as 2.5) is included in the package name | ||
| 738 | + # because having two version of python installed at the same time is | ||
| 740 | 739 | # common. | |
| 741 | 740 | pkgname = '%s-%s'%(recipe['name'], getVersion()) | |
| 742 | 741 | srcdir = recipe.get('source') | |
@@ -910,7 +909,7 @@ def installSize(clear=False, _saved=[]): | |||
| 910 | 909 | ||
| 911 | 910 | def buildDMG(): | |
| 912 | 911 | """ | |
| 913 | - Create DMG containing the rootDir | ||
| 912 | + Create DMG containing the rootDir. | ||
| 914 | 913 | """ | |
| 915 | 914 | outdir = os.path.join(WORKDIR, 'diskimage') | |
| 916 | 915 | if os.path.exists(outdir): | |
@@ -923,7 +922,7 @@ def buildDMG(): | |||
| 923 | 922 | imagepath = imagepath + '.dmg' | |
| 924 | 923 | ||
| 925 | 924 | os.mkdir(outdir) | |
| 926 | - runCommand("hdiutil create -volname 'Univeral MacPython %s' -srcfolder %s %s"%( | ||
| 925 | + runCommand("hdiutil create -volname 'Universal MacPython %s' -srcfolder %s %s"%( | ||
| 927 | 926 | getFullVersion(), | |
| 928 | 927 | shellQuote(os.path.join(WORKDIR, 'installer')), | |
| 929 | 928 | shellQuote(imagepath))) | |
0 commit comments