Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 23b44a3

Browse files
loewisloewis
committed
Patch #812378: Normalize white space.
1 parent f8d59d2 commit 23b44a3

10 files changed

Lines changed: 208 additions & 209 deletions

File tree

‎Lib/distutils/sysconfig.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ def get_python_inc(plat_specific=0, prefix=None):
7070
return os.path.join(prefix, "include")
7171
elif os.name == "mac":
7272
if plat_specific:
73-
return os.path.join(prefix, "Mac", "Include")
73+
return os.path.join(prefix, "Mac", "Include")
7474
else:
75-
return os.path.join(prefix, "Include")
75+
return os.path.join(prefix, "Include")
7676
elif os.name == "os2":
7777
return os.path.join(prefix, "Include")
7878
else:
@@ -160,7 +160,7 @@ def customize_compiler(compiler):
160160
if os.environ.has_key('LDFLAGS'):
161161
ldshared = ldshared + ' ' + os.environ['LDFLAGS']
162162
if basecflags:
163-
opt = basecflags + ' ' + opt
163+
opt = basecflags + ' ' + opt
164164
if os.environ.has_key('CFLAGS'):
165165
opt = opt + ' ' + os.environ['CFLAGS']
166166
ldshared = ldshared + ' ' + os.environ['CFLAGS']

‎Tools/faqwiz/faqconf.py‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,31 @@
1515

1616
# Parameters you definitely want to change
1717

18-
SHORTNAME = "Generic" # FAQ name with "FAQ" omitted
19-
PASSWORD = "" # Password for editing
20-
OWNERNAME = "FAQ owner" # Name for feedback
21-
OWNEREMAIL = "[email protected]" # Email for feedback
22-
HOMEURL = "http://www.python.org" # Related home page
23-
HOMENAME = "Python home" # Name of related home page
24-
RCSBINDIR = "/usr/local/bin/" # Directory containing RCS commands
25-
# (must end in a slash)
18+
SHORTNAME = "Generic" # FAQ name with "FAQ" omitted
19+
PASSWORD = "" # Password for editing
20+
OWNERNAME = "FAQ owner" # Name for feedback
21+
OWNEREMAIL = "[email protected]" # Email for feedback
22+
HOMEURL = "http://www.python.org" # Related home page
23+
HOMENAME = "Python home" # Name of related home page
24+
RCSBINDIR = "/usr/local/bin/" # Directory containing RCS commands
25+
# (must end in a slash)
2626

2727
# Parameters you can normally leave alone
2828

29-
MAXHITS = 10 # Max #hits to be shown directly
30-
COOKIE_LIFETIME = 28*24*3600 # Cookie expiration in seconds
31-
# (28*24*3600 = 28 days = 4 weeks)
29+
MAXHITS = 10 # Max #hits to be shown directly
30+
COOKIE_LIFETIME = 28*24*3600 # Cookie expiration in seconds
31+
# (28*24*3600 = 28 days = 4 weeks)
3232
PROCESS_PREFORMAT = 1 # toggle whether preformatted text
3333
# will replace urls and emails with
3434
# HTML links
3535

3636
# Markers appended to title to indicate recently change
3737
# (may contain HTML, e.g. <IMG>); and corresponding
3838

39-
MARK_VERY_RECENT = " **" # Changed very recently
40-
MARK_RECENT = " *" # Changed recently
41-
DT_VERY_RECENT = 24*3600 # 24 hours
42-
DT_RECENT = 7*24*3600 # 7 days
39+
MARK_VERY_RECENT = " **" # Changed very recently
40+
MARK_RECENT = " *" # Changed recently
41+
DT_VERY_RECENT = 24*3600 # 24 hours
42+
DT_RECENT = 7*24*3600 # 7 days
4343

4444
EXPLAIN_MARKS = """
4545
<P>(Entries marked with ** were changed within the last 24 hours;
@@ -49,18 +49,18 @@
4949

5050
# Version -- don't change unless you edit faqwiz.py
5151

52-
WIZVERSION = "1.0.4" # FAQ Wizard version
52+
WIZVERSION = "1.0.4" # FAQ Wizard version
5353

5454
import os, sys
5555
if os.name in ['nt',]:
5656
# On NT we'll probably be running python from a batch file,
5757
# so sys.argv[0] is not helpful
58-
FAQCGI = 'faq.bat' # Relative URL of the FAQ cgi script
58+
FAQCGI = 'faq.bat' # Relative URL of the FAQ cgi script
5959
# LOGNAME is not typically set on NT
6060
os.environ[ 'LOGNAME' ] = "FAQWizard"
6161
else:
6262
# This parameter is normally overwritten with a dynamic value
63-
FAQCGI = 'faqw.py' # Relative URL of the FAQ cgi script
63+
FAQCGI = 'faqw.py' # Relative URL of the FAQ cgi script
6464
FAQCGI = os.path.basename(sys.argv[0]) or FAQCGI
6565
del os, sys
6666

@@ -84,8 +84,8 @@
8484

8585
# Calculated parameter names
8686

87-
COOKIE_NAME = SHORTNAME + "-FAQ-Wizard" # Name used for Netscape cookie
88-
FAQNAME = SHORTNAME + " FAQ" # Name of the FAQ
87+
COOKIE_NAME = SHORTNAME + "-FAQ-Wizard" # Name used for Netscape cookie
88+
FAQNAME = SHORTNAME + " FAQ" # Name of the FAQ
8989

9090
# ----------------------------------------------------------------------
9191

@@ -175,22 +175,22 @@
175175
<INPUT TYPE=submit VALUE="Search"><BR>
176176
<INPUT TYPE=radio NAME=querytype VALUE=simple CHECKED>
177177
Simple string
178-
/
178+
/
179179
<INPUT TYPE=radio NAME=querytype VALUE=regex>
180180
Regular expression
181-
/<BR>
181+
/<BR>
182182
<INPUT TYPE=radio NAME=querytype VALUE=anykeywords>
183183
Keywords (any)
184-
/
184+
/
185185
<INPUT TYPE=radio NAME=querytype VALUE=allkeywords>
186186
Keywords (all)
187-
<BR>
187+
<BR>
188188
<INPUT TYPE=radio NAME=casefold VALUE=yes CHECKED>
189189
Fold case
190-
/
190+
/
191191
<INPUT TYPE=radio NAME=casefold VALUE=no>
192192
Case sensitive
193-
<BR>
193+
<BR>
194194
<INPUT TYPE=hidden NAME=req VALUE=search>
195195
</FORM>
196196
@@ -362,14 +362,14 @@
362362
Please provide the following information for logging purposes:
363363
<TABLE FRAME=none COLS=2>
364364
<TR>
365-
<TD>Name:
366-
<TD><INPUT TYPE=text SIZE=40 NAME=author VALUE="%(author)s">
365+
<TD>Name:
366+
<TD><INPUT TYPE=text SIZE=40 NAME=author VALUE="%(author)s">
367367
<TR>
368-
<TD>Email:
369-
<TD><INPUT TYPE=text SIZE=40 NAME=email VALUE="%(email)s">
368+
<TD>Email:
369+
<TD><INPUT TYPE=text SIZE=40 NAME=email VALUE="%(email)s">
370370
<TR>
371-
<TD>Password:
372-
<TD><INPUT TYPE=password SIZE=20 NAME=password VALUE="%(password)s">
371+
<TD>Password:
372+
<TD><INPUT TYPE=password SIZE=20 NAME=password VALUE="%(password)s">
373373
</TABLE>
374374
375375
<INPUT TYPE=submit NAME=review VALUE="Preview Edit">

‎Tools/framer/framer/template.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
static struct PyMethodDef %(MethodDefName)s[] = {"""
2020

2121
methoddef_def = """\
22-
{"%(PythonName)s", (PyCFunction)%(CName)s, %(MethType)s},"""
22+
{"%(PythonName)s", (PyCFunction)%(CName)s, %(MethType)s},"""
2323

2424
methoddef_def_doc = """\
25-
{"%(PythonName)s", (PyCFunction)%(CName)s, %(MethType)s,
25+
{"%(PythonName)s", (PyCFunction)%(CName)s, %(MethType)s,
2626
%(DocstringVar)s},"""
2727

2828
methoddef_end = """\
29-
{NULL, NULL}
29+
{NULL, NULL}
3030
};
3131
"""
3232

@@ -43,7 +43,7 @@
4343
{"%(PythonName)s", %(Type)s, OFF(%(CName)s), %(Flags)s},"""
4444

4545
memberdef_end = """\
46-
{NULL}
46+
{NULL}
4747
};
4848
4949
#undef OFF

‎Tools/modulator/EXAMPLE.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
o3.abbrev = 'ot'
3535
o3.methodlist = ['method1', 'method2']
3636
o3.funclist = ['new', 'tp_dealloc', 'tp_print', 'tp_getattr', 'tp_setattr',
37-
'tp_compare', 'tp_repr', 'tp_hash']
37+
'tp_compare', 'tp_repr', 'tp_hash']
3838
o3.typelist = ['tp_as_sequence', 'structure']
3939

4040
#

‎Tools/modulator/ScrolledListbox.py‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,24 @@
1414
from Tkinter import _cnfmerge
1515

1616
class ScrolledListbox(Listbox):
17-
def __init__(self, master=None, cnf={}):
18-
cnf = _cnfmerge(cnf)
19-
fcnf = {}
20-
vcnf = {'name': 'vbar',
21-
Pack: {'side': 'right', 'fill': 'y'},}
22-
for k in cnf.keys():
23-
if type(k) == ClassType or k == 'name':
24-
fcnf[k] = cnf[k]
25-
del cnf[k]
26-
self.frame = Frame(master, fcnf)
27-
self.vbar = Scrollbar(self.frame, vcnf)
28-
cnf[Pack] = {'side': 'left', 'fill': 'both', 'expand': 'yes'}
29-
cnf['name'] = 'list'
30-
Listbox.__init__(self, self.frame, cnf)
31-
self['yscrollcommand'] = (self.vbar, 'set')
32-
self.vbar['command'] = (self, 'yview')
17+
def __init__(self, master=None, cnf={}):
18+
cnf = _cnfmerge(cnf)
19+
fcnf = {}
20+
vcnf = {'name': 'vbar',
21+
Pack: {'side': 'right', 'fill': 'y'},}
22+
for k in cnf.keys():
23+
if type(k) == ClassType or k == 'name':
24+
fcnf[k] = cnf[k]
25+
del cnf[k]
26+
self.frame = Frame(master, fcnf)
27+
self.vbar = Scrollbar(self.frame, vcnf)
28+
cnf[Pack] = {'side': 'left', 'fill': 'both', 'expand': 'yes'}
29+
cnf['name'] = 'list'
30+
Listbox.__init__(self, self.frame, cnf)
31+
self['yscrollcommand'] = (self.vbar, 'set')
32+
self.vbar['command'] = (self, 'yview')
3333

34-
# Copy Pack methods of self.frame -- hack!
35-
for m in Pack.__dict__.keys():
36-
if m[0] != '_' and m != 'config':
37-
setattr(self, m, getattr(self.frame, m))
34+
# Copy Pack methods of self.frame -- hack!
35+
for m in Pack.__dict__.keys():
36+
if m[0] != '_' and m != 'config':
37+
setattr(self, m, getattr(self.frame, m))

‎Tools/pynche/PyncheWidget.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def __init__(self, version, switchboard, master=None, extrapath=[]):
7575
# Help menu
7676
#
7777
helpmenu = Menu(menubar, name='help', tearoff=0)
78-
helpmenu.add_command(label='About Pynche...',
78+
helpmenu.add_command(label='About Pynche...',
7979
command=self.__popup_about,
8080
underline=0)
8181
helpmenu.add_command(label='Help...',

0 commit comments

Comments
 (0)