mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 18:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Whitespace normalization.

Browse source
This commit is contained in:
Tim Peters 2004-08-26 05:23:19 +00:00
parent 5b799c1f3d
commit 66cb018c96
4 changed files with 33 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Lib/test/test_capi.py
View file

@ -46,4 +46,3 @@ if have_thread_state:
import threading import threading
t=threading.Thread(target=TestThreadState) t=threading.Thread(target=TestThreadState)
t.start() t.start()

10
Lib/test/test_peepholer.py
View file

@ -42,8 +42,8 @@ class TestTranforms(unittest.TestCase):
def test_none_as_constant(self): def test_none_as_constant(self):
# LOAD_GLOBAL None --> LOAD_CONST None # LOAD_GLOBAL None --> LOAD_CONST None
def f(x): def f(x):
None None
return x return x
asm = disassemble(f) asm = disassemble(f)
for elem in ('LOAD_GLOBAL',): for elem in ('LOAD_GLOBAL',):
self.assert_(elem not in asm) self.assert_(elem not in asm)
@ -53,9 +53,9 @@ class TestTranforms(unittest.TestCase):
def test_while_one(self): def test_while_one(self):
# Skip over: LOAD_CONST trueconst JUMP_IF_FALSE xx POP_TOP # Skip over: LOAD_CONST trueconst JUMP_IF_FALSE xx POP_TOP
def f(): def f():
while 1: while 1:
pass pass
return list return list
asm = disassemble(f) asm = disassemble(f)
for elem in ('LOAD_CONST', 'JUMP_IF_FALSE'): for elem in ('LOAD_CONST', 'JUMP_IF_FALSE'):
self.assert_(elem not in asm) self.assert_(elem not in asm)

52
Tools/msi/msi.py
View file

@ -111,7 +111,7 @@ if major+minor <= "23":
'_winreg.pyd', '_winreg.pyd',
'datetime.pyd' 'datetime.pyd'
'mmap.pyd', 'mmap.pyd',
'parser.pyd', 'parser.pyd',
]) ])
if testpackage: if testpackage:
@ -151,7 +151,7 @@ def build_database():
w64 = ".ia64" w64 = ".ia64"
else: else:
w64 = "" w64 = ""
db = msilib.init_database("python-%s%s.msi" % (full_current_version, w64), db = msilib.init_database("python-%s%s.msi" % (full_current_version, w64),
schema, ProductName="Python "+full_current_version, schema, ProductName="Python "+full_current_version,
ProductCode=product_code, ProductCode=product_code,
ProductVersion=current_version, ProductVersion=current_version,
@ -196,10 +196,10 @@ def remove_old_versions(db):
# a release, we remove all snapshots, and all earlier releases. # a release, we remove all snapshots, and all earlier releases.
if snapshot: if snapshot:
add_data(db, "Upgrade", add_data(db, "Upgrade",
[(upgrade_code_snapshot, start, [(upgrade_code_snapshot, start,
current_version, current_version,
None, # Ignore language None, # Ignore language
migrate_features, migrate_features,
None, # Migrate ALL features None, # Migrate ALL features
"REMOVEOLDSNAPSHOT")]) "REMOVEOLDSNAPSHOT")])
props = "REMOVEOLDSNAPSHOT" props = "REMOVEOLDSNAPSHOT"
@ -400,7 +400,7 @@ def add_ui(db):
# to the action, and optionally the condition for the event, and the order # to the action, and optionally the condition for the event, and the order
# of events. # of events.
c.event("EndDialog", "Exit") c.event("EndDialog", "Exit")
user_exit=PyDialog(db, "UserExit", x, y, w, h, modal, title, user_exit=PyDialog(db, "UserExit", x, y, w, h, modal, title,
"Finish", "Finish", "Finish") "Finish", "Finish", "Finish")
user_exit.title("[ProductName] Installer was interrupted") user_exit.title("[ProductName] Installer was interrupted")
@ -413,7 +413,7 @@ def add_ui(db):
"Click the Finish button to exit the Installer.") "Click the Finish button to exit the Installer.")
c = user_exit.next("Finish", "Cancel", name="Finish") c = user_exit.next("Finish", "Cancel", name="Finish")
c.event("EndDialog", "Exit") c.event("EndDialog", "Exit")
exit_dialog = PyDialog(db, "ExitDialog", x, y, w, h, modal, title, exit_dialog = PyDialog(db, "ExitDialog", x, y, w, h, modal, title,
"Finish", "Finish", "Finish") "Finish", "Finish", "Finish")
exit_dialog.title("Completing the [ProductName] Installer") exit_dialog.title("Completing the [ProductName] Installer")
@ -426,7 +426,7 @@ def add_ui(db):
"\n" "\n"
" Mark Hammond, without whose years of freely shared Windows\n" " Mark Hammond, without whose years of freely shared Windows\n"
" expertise, Python for Windows would still be Python for DOS.") " expertise, Python for Windows would still be Python for DOS.")
exit_dialog.text("Description", 135, 235, 220, 20, 0x30003, exit_dialog.text("Description", 135, 235, 220, 20, 0x30003,
"Click the Finish button to exit the Installer.") "Click the Finish button to exit the Installer.")
c = exit_dialog.next("Finish", "Cancel", name="Finish") c = exit_dialog.next("Finish", "Cancel", name="Finish")
@ -475,13 +475,13 @@ def add_ui(db):
# Global "Query Cancel" dialog # Global "Query Cancel" dialog
cancel = Dialog(db, "CancelDlg", 50, 10, 260, 85, 3, title, cancel = Dialog(db, "CancelDlg", 50, 10, 260, 85, 3, title,
"No", "No", "No") "No", "No", "No")
cancel.text("Text", 48, 15, 194, 30, 3, cancel.text("Text", 48, 15, 194, 30, 3,
"Are you sure you want to cancel [ProductName] installation?") "Are you sure you want to cancel [ProductName] installation?")
cancel.control("Icon", "Icon", 15, 15, 24, 24, 5242881, None, cancel.control("Icon", "Icon", 15, 15, 24, 24, 5242881, None,
"py.ico", None, None) "py.ico", None, None)
c=cancel.pushbutton("Yes", 72, 57, 56, 17, 3, "Yes", "No") c=cancel.pushbutton("Yes", 72, 57, 56, 17, 3, "Yes", "No")
c.event("EndDialog", "Exit") c.event("EndDialog", "Exit")
c=cancel.pushbutton("No", 132, 57, 56, 17, 3, "No", "Yes") c=cancel.pushbutton("No", 132, 57, 56, 17, 3, "No", "Yes")
c.event("EndDialog", "Return") c.event("EndDialog", "Return")
@ -566,14 +566,14 @@ def add_ui(db):
c=features.cancel("Cancel", "Tree") c=features.cancel("Cancel", "Tree")
c.event("SpawnDialog", "CancelDlg") c.event("SpawnDialog", "CancelDlg")
# The browse property is not used, since we have only a single target path (selected already) # The browse property is not used, since we have only a single target path (selected already)
features.control("Tree", "SelectionTree", 135, 75, 220, 95, 7, "_BrowseProperty", features.control("Tree", "SelectionTree", 135, 75, 220, 95, 7, "_BrowseProperty",
"Tree of selections", "Back", None) "Tree of selections", "Back", None)
#c=features.pushbutton("Reset", 42, 243, 56, 17, 3, "Reset", "DiskCost") #c=features.pushbutton("Reset", 42, 243, 56, 17, 3, "Reset", "DiskCost")
#c.mapping("SelectionNoItems", "Enabled") #c.mapping("SelectionNoItems", "Enabled")
#c.event("Reset", "0") #c.event("Reset", "0")
features.control("Box", "GroupBox", 135, 170, 225, 90, 1, None, None, None, None) features.control("Box", "GroupBox", 135, 170, 225, 90, 1, None, None, None, None)
c=features.xbutton("DiskCost", "Disk &Usage", None, 0.10) c=features.xbutton("DiskCost", "Disk &Usage", None, 0.10)
@ -586,7 +586,7 @@ def add_ui(db):
c=features.text("ItemDescription", 140, 180, 210, 30, 3, c=features.text("ItemDescription", 140, 180, 210, 30, 3,
"Multiline description of the currently selected item.") "Multiline description of the currently selected item.")
c.mapping("SelectionDescription","Text") c.mapping("SelectionDescription","Text")
c=features.text("ItemSize", 140, 210, 210, 45, 3, c=features.text("ItemSize", 140, 210, 210, 45, 3,
"The size of the currently selected item.") "The size of the currently selected item.")
c.mapping("SelectionSize", "Text") c.mapping("SelectionSize", "Text")
@ -629,7 +629,7 @@ def add_ui(db):
g.add("ALL", 0, 5, 150, 20, "Install for all users") g.add("ALL", 0, 5, 150, 20, "Install for all users")
g.add("JUSTME", 0, 25, 150, 20, "Install just for me") g.add("JUSTME", 0, 25, 150, 20, "Install just for me")
whichusers.back("Back", None, active=0) whichusers.back("Back", None, active=0)
c = whichusers.next("Next >", "Cancel") c = whichusers.next("Next >", "Cancel")
c.event("[ALLUSERS]", "1", 'WhichUsers="ALL"', 1) c.event("[ALLUSERS]", "1", 'WhichUsers="ALL"', 1)
@ -637,7 +637,7 @@ def add_ui(db):
c = whichusers.cancel("Cancel", "AdminInstall") c = whichusers.cancel("Cancel", "AdminInstall")
c.event("SpawnDialog", "CancelDlg") c.event("SpawnDialog", "CancelDlg")
##################################################################### #####################################################################
# Advanced Dialog. # Advanced Dialog.
advanced = PyDialog(db, "AdvancedDlg", x, y, w, h, modal, title, advanced = PyDialog(db, "AdvancedDlg", x, y, w, h, modal, title,
@ -652,9 +652,9 @@ def add_ui(db):
c = advanced.cancel("Cancel", "CompilePyc") c = advanced.cancel("Cancel", "CompilePyc")
c.event("SpawnDialog", "CancelDlg") c.event("SpawnDialog", "CancelDlg")
##################################################################### #####################################################################
# Existing Directory dialog # Existing Directory dialog
dlg = Dialog(db, "ExistingDirectoryDlg", 50, 30, 200, 80, modal, title, dlg = Dialog(db, "ExistingDirectoryDlg", 50, 30, 200, 80, modal, title,
"No", "No", "No") "No", "No", "No")
dlg.text("Title", 10, 20, 180, 40, 3, dlg.text("Title", 10, 20, 180, 40, 3,
@ -702,7 +702,7 @@ def add_ui(db):
g.add("Change", 0, 0, 200, 17, "&Change [ProductName]") g.add("Change", 0, 0, 200, 17, "&Change [ProductName]")
g.add("Repair", 0, 18, 200, 17, "&Repair [ProductName]") g.add("Repair", 0, 18, 200, 17, "&Repair [ProductName]")
g.add("Remove", 0, 36, 200, 17, "Re&move [ProductName]") g.add("Remove", 0, 36, 200, 17, "Re&move [ProductName]")
maint.back("< Back", None, active=False) maint.back("< Back", None, active=False)
c=maint.next("Finish", "Cancel") c=maint.next("Finish", "Cancel")
# Change installation: Change progress dialog to "Change", then ask # Change installation: Change progress dialog to "Change", then ask
@ -724,12 +724,12 @@ def add_ui(db):
c.event("[Progress2]", "removes", 'MaintenanceForm_Action="Remove"', 13) c.event("[Progress2]", "removes", 'MaintenanceForm_Action="Remove"', 13)
c.event("Remove", "ALL", 'MaintenanceForm_Action="Remove"', 14) c.event("Remove", "ALL", 'MaintenanceForm_Action="Remove"', 14)
# Close dialog when maintenance action scheduled # Close dialog when maintenance action scheduled
c.event("EndDialog", "Return", 'MaintenanceForm_Action<>"Change"', 20) c.event("EndDialog", "Return", 'MaintenanceForm_Action<>"Change"', 20)
c.event("NewDialog", "SelectFeaturesDlg", 'MaintenanceForm_Action="Change"', 21) c.event("NewDialog", "SelectFeaturesDlg", 'MaintenanceForm_Action="Change"', 21)
maint.cancel("Cancel", "RepairRadioGroup").event("SpawnDialog", "CancelDlg") maint.cancel("Cancel", "RepairRadioGroup").event("SpawnDialog", "CancelDlg")
# See "Feature Table". The feature level is 1 for all features, # See "Feature Table". The feature level is 1 for all features,
# and the feature attributes are 0 for the DefaultFeature, and # and the feature attributes are 0 for the DefaultFeature, and
@ -765,12 +765,12 @@ def add_features(db):
htmlfiles = Feature(db, "Documentation", "Documentation", htmlfiles = Feature(db, "Documentation", "Documentation",
"Python HTMLHelp File", 7, parent = default_feature) "Python HTMLHelp File", 7, parent = default_feature)
tools = Feature(db, "Tools", "Utility Scripts", tools = Feature(db, "Tools", "Utility Scripts",
"Python utility scripts (Tools/", 9, "Python utility scripts (Tools/", 9,
parent = default_feature, attributes=2) parent = default_feature, attributes=2)
testsuite = Feature(db, "Testsuite", "Test suite", testsuite = Feature(db, "Testsuite", "Test suite",
"Python test suite (Lib/test/)", 11, "Python test suite (Lib/test/)", 11,
parent = default_feature, attributes=2|8) parent = default_feature, attributes=2|8)
def extract_msvcr71(): def extract_msvcr71():
import _winreg import _winreg
@ -840,7 +840,7 @@ def add_files(db):
dlldir.add_file("msvcr71.dll", src=os.path.abspath("msvcr71.dll"), dlldir.add_file("msvcr71.dll", src=os.path.abspath("msvcr71.dll"),
version=version, language=lang) version=version, language=lang)
tmpfiles.append("msvcr71.dll") tmpfiles.append("msvcr71.dll")
# Add all .py files in Lib, except lib-tk, test # Add all .py files in Lib, except lib-tk, test
dirs={} dirs={}
pydirs = [(root,"Lib")] pydirs = [(root,"Lib")]
@ -925,7 +925,7 @@ def add_files(db):
if f.endswith("_d.pyd"): continue # debug version if f.endswith("_d.pyd"): continue # debug version
if f in dlls: continue if f in dlls: continue
print "WARNING: Unknown extension", f print "WARNING: Unknown extension", f
# Add headers # Add headers
default_feature.set_current() default_feature.set_current()
lib = PyDirectory(db, cab, root, "include", "include", "INCLUDE|include") lib = PyDirectory(db, cab, root, "include", "include", "INCLUDE|include")
@ -1022,7 +1022,7 @@ def add_registry(db):
[("Python.File", None, None, "Python File", "python_icon.exe", 0), [("Python.File", None, None, "Python File", "python_icon.exe", 0),
("Python.NoConFile", None, None, "Python File (no console)", "python_icon.exe", 0), ("Python.NoConFile", None, None, "Python File (no console)", "python_icon.exe", 0),
("Python.CompiledFile", None, None, "Compiled Python File", "python_icon.exe", 1)]) ("Python.CompiledFile", None, None, "Compiled Python File", "python_icon.exe", 1)])
# Non-advertised verbs: for advertised verbs, we would need to invoke the same # Non-advertised verbs: for advertised verbs, we would need to invoke the same
# executable for both open and "Edit with IDLE". This cannot work, as we want # executable for both open and "Edit with IDLE". This cannot work, as we want
# to use pythonw.exe in either case # to use pythonw.exe in either case
@ -1035,7 +1035,7 @@ def add_registry(db):
r'"[TARGETDIR]pythonw.exe" "[TARGETDIR]Lib\idlelib\idle.pyw" -n -e "%1"', r'"[TARGETDIR]pythonw.exe" "[TARGETDIR]Lib\idlelib\idle.pyw" -n -e "%1"',
"REGISTRY.tcl"), "REGISTRY.tcl"),
]) ])
# Registry keys # Registry keys
prefix = r"Software\%sPython\PythonCore\%s" % (testprefix, short_version) prefix = r"Software\%sPython\PythonCore\%s" % (testprefix, short_version)
add_data(db, "Registry", add_data(db, "Registry",

4
setup.py
View file

@ -119,7 +119,7 @@ class PyBuildExt(build_ext):
# Platform-dependent module source and include directories # Platform-dependent module source and include directories
platform = self.get_platform() platform = self.get_platform()
if platform in ('darwin', 'mac') and ("--disable-toolbox-glue" not in if platform in ('darwin', 'mac') and ("--disable-toolbox-glue" not in
sysconfig.get_config_var("CONFIG_ARGS")): sysconfig.get_config_var("CONFIG_ARGS")):
# Mac OS X also includes some mac-specific modules # Mac OS X also includes some mac-specific modules
macmoddir = os.path.join(os.getcwd(), srcdir, 'Mac/Modules') macmoddir = os.path.join(os.getcwd(), srcdir, 'Mac/Modules')
@ -790,7 +790,7 @@ class PyBuildExt(build_ext):
# SunOS specific modules # SunOS specific modules
exts.append( Extension('sunaudiodev', ['sunaudiodev.c']) ) exts.append( Extension('sunaudiodev', ['sunaudiodev.c']) )
if platform == 'darwin' and ("--disable-toolbox-glue" not in if platform == 'darwin' and ("--disable-toolbox-glue" not in
sysconfig.get_config_var("CONFIG_ARGS")): sysconfig.get_config_var("CONFIG_ARGS")):
# Mac OS X specific modules. # Mac OS X specific modules.
exts.append( Extension('_CF', ['cf/_CFmodule.c', 'cf/pycfbridge.c'], exts.append( Extension('_CF', ['cf/_CFmodule.c', 'cf/pycfbridge.c'],