Skip to content

Commit ab9ba27

Browse files
tim-onetim-one
committed
Whitespace normalization.
1 parent c7ca3ff commit ab9ba27

12 files changed

Lines changed: 54 additions & 55 deletions

‎Lib/cgi.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,9 @@ def parse_multipart(fp, pdict):
247247
if pdict.has_key('boundary'):
248248
boundary = pdict['boundary']
249249
if not valid_boundary(boundary):
250-
raise ValueError, ('Invalid boundary in multipart form: %s'
250+
raise ValueError, ('Invalid boundary in multipart form: %s'
251251
% `ib`)
252-
252+
253253
nextpart = "--" + boundary
254254
lastpart = "--" + boundary + "--"
255255
partdict = {}
@@ -600,7 +600,7 @@ def read_multi(self, environ, keep_blank_values, strict_parsing):
600600
"""Internal: read a part that is itself multipart."""
601601
ib = self.innerboundary
602602
if not valid_boundary(ib):
603-
raise ValueError, ('Invalid boundary in multipart form: %s'
603+
raise ValueError, ('Invalid boundary in multipart form: %s'
604604
% `ib`)
605605
self.list = []
606606
klass = self.FieldStorageClass or self.__class__

‎Lib/cmd.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
arguments text, line, begidx, endidx. text is string we are matching
2121
against, all returned matches must begin with it. line is the current
2222
input line (lstripped), begidx and endidx are the beginning and end
23-
indexes of the text being matched, which could be used to provide
23+
indexes of the text being matched, which could be used to provide
2424
different completion depending upon which position the argument is in.
2525
2626
The `default' method may be overridden to intercept commands for which there
2727
is no do_ method.
2828
2929
The `completedefault' method may be overridden to intercept completions for
30-
commands that have no complete_ method.
30+
commands that have no complete_ method.
3131
3232
The data member `self.ruler' sets the character used to draw separator lines
3333
in the help messages. If empty, no ruler line is drawn. It defaults to "=".
@@ -66,7 +66,7 @@ class Cmd:
6666
nohelp = "*** No help on %s"
6767
use_rawinput = 1
6868

69-
def __init__(self, completekey='tab'):
69+
def __init__(self, completekey='tab'):
7070
if completekey:
7171
try:
7272
import readline
@@ -131,7 +131,7 @@ def parseline(self, line):
131131
while i < n and line[i] in self.identchars: i = i+1
132132
cmd, arg = line[:i], line[i:].strip()
133133
return cmd, arg, line
134-
134+
135135
def onecmd(self, line):
136136
cmd, arg, line = self.parseline(line)
137137
if not line:
@@ -191,7 +191,7 @@ def complete(self, text, state):
191191
return self.completion_matches[state]
192192
except IndexError:
193193
return None
194-
194+
195195
def get_names(self):
196196
# Inheritance says we have to look in class and
197197
# base classes; order is not important.

‎Lib/gzip.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ def tell(self):
277277

278278
def rewind(self):
279279
'''Return the uncompressed stream file position indicator to the
280-
beginning of the file'''
280+
beginning of the file'''
281281
if self.mode != READ:
282282
raise IOError("Can't rewind in write mode")
283283
self.fileobj.seek(0)
@@ -291,7 +291,7 @@ def seek(self, offset):
291291
if offset < self.offset:
292292
raise IOError('Negative seek in write mode')
293293
count = offset - self.offset
294-
for i in range(count/1024):
294+
for i in range(count/1024):
295295
f.write(1024*'\0')
296296
self.write((count%1024)*'\0')
297297
elif self.mode == READ:

‎Lib/test/test___all__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def check_all(modname):
4141
# In case _socket fails to build, make this test fail more gracefully
4242
# than an AttributeError somewhere deep in CGIHTTPServer.
4343
import _socket
44-
44+
4545
check_all("BaseHTTPServer")
4646
check_all("CGIHTTPServer")
4747
check_all("ConfigParser")

‎Lib/test/test_codeop.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def assertValid(self, str, symbol='single'):
1313
'''succeed iff str is a valid piece of code'''
1414
expected = compile(str, "<input>", symbol)
1515
self.assertEquals( compile_command(str, "<input>", symbol), expected)
16-
16+
1717

1818
def assertIncomplete(self, str, symbol='single'):
1919
'''succeed iff str is the start of a valid piece of code'''
@@ -41,13 +41,13 @@ def test_valid(self):
4141
av("a=3\n\n")
4242

4343
# special case
44-
self.assertEquals(compile_command(""),
44+
self.assertEquals(compile_command(""),
4545
compile("pass", "<input>", 'single'))
4646

4747
av("3**3","eval")
4848
av("(lambda z: \n z**3)","eval")
4949
av("#a\n#b\na**3","eval")
50-
50+
5151
def test_incomplete(self):
5252
ai = self.assertIncomplete
5353
ai("(a **")
@@ -59,7 +59,7 @@ def test_incomplete(self):
5959
ai("if 9==3:\n pass\nelse:\n pass")
6060
ai("a = (")
6161
ai("a = 9+ \\")
62-
62+
6363
ai("(","eval")
6464
ai("(\n\n\n","eval")
6565
ai("(9+","eval")

‎Lib/test/test_glob.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,4 +107,3 @@ def test_glob_directory_names(self):
107107
os.path.join('aab', 'F')]))
108108

109109
run_unittest(GlobTests)
110-

‎Lib/test/test_gzip.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
# Try seek, write test
7272
f = gzip.GzipFile(filename, 'w')
7373
for pos in range(0, 256, 16):
74-
f.seek(pos)
74+
f.seek(pos)
7575
f.write('GZ\n')
7676
f.close()
7777

‎Lib/test/test_mhlib.py‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def writeProfile(dict):
4343

4444
def writeContext(folder):
4545
folder = normF(folder)
46-
writeFile(os.path.join(_mhpath, "context"),
46+
writeFile(os.path.join(_mhpath, "context"),
4747
"Current-Folder: %s\n" % folder)
4848

4949
def writeCurMessage(folder, cur):
@@ -96,31 +96,31 @@ class MhlibTests(unittest.TestCase):
9696
def setUp(self):
9797
deltree(_mhroot)
9898
mkdirs(_mhpath)
99-
writeProfile({'Path' : os.path.abspath(_mhpath),
99+
writeProfile({'Path' : os.path.abspath(_mhpath),
100100
'Editor': 'emacs',
101101
'ignored-attribute': 'camping holiday'})
102102
# Note: These headers aren't really conformant to RFC822, but
103103
# mhlib shouldn't care about that.
104104

105105
# An inbox with a couple of messages.
106-
writeMessage('inbox', 1,
106+
writeMessage('inbox', 1,
107107
{'From': 'Mrs. Premise',
108108
'To': 'Mrs. Conclusion',
109109
'Date': '18 July 2001'}, "Hullo, Mrs. Conclusion!\n")
110-
writeMessage('inbox', 2,
110+
writeMessage('inbox', 2,
111111
{'From': 'Mrs. Conclusion',
112112
'To': 'Mrs. Premise',
113113
'Date': '29 July 2001'}, "Hullo, Mrs. Premise!\n")
114-
114+
115115
# A folder with many messages
116116
for i in range(5, 101)+range(101, 201, 2):
117-
writeMessage('wide', i,
117+
writeMessage('wide', i,
118118
{'From': 'nowhere', 'Subject': 'message #%s' % i},
119119
"This is message number %s\n" % i)
120-
120+
121121
# A deeply nested folder
122122
def deep(folder, n):
123-
writeMessage(folder, n,
123+
writeMessage(folder, n,
124124
{'Subject': 'Message %s/%s' % (folder, n) },
125125
"This is message number %s in %s\n" % (n, folder) )
126126
deep('deep/f1', 1)
@@ -131,10 +131,10 @@ def deep(folder, n):
131131
deep('deep', 3)
132132
deep('deep/f2/f3', 1)
133133
deep('deep/f2/f3', 2)
134-
134+
135135
def tearDown(self):
136136
deltree(_mhroot)
137-
137+
138138
def test_basic(self):
139139
writeContext('inbox')
140140
writeCurMessage('inbox', 2)
@@ -154,21 +154,21 @@ def test_basic(self):
154154
mh.setcontext('inbox')
155155

156156
inbox = mh.openfolder('inbox')
157-
eq(inbox.getfullname(),
157+
eq(inbox.getfullname(),
158158
os.path.join(os.path.abspath(_mhpath), 'inbox'))
159-
eq(inbox.getsequencesfilename(),
159+
eq(inbox.getsequencesfilename(),
160160
os.path.join(os.path.abspath(_mhpath), 'inbox', '.mh_sequences'))
161-
eq(inbox.getmessagefilename(1),
161+
eq(inbox.getmessagefilename(1),
162162
os.path.join(os.path.abspath(_mhpath), 'inbox', '1'))
163-
163+
164164
def test_listfolders(self):
165165
mh = getMH()
166166
eq = self.assertEquals
167167

168168
folders = mh.listfolders()
169169
folders.sort()
170170
eq(folders, ['deep', 'inbox', 'wide'])
171-
171+
172172
folders = mh.listallfolders()
173173
folders.sort()
174174
eq(folders, map(normF, ['deep', 'deep/f1', 'deep/f2', 'deep/f2/f3',
@@ -177,7 +177,7 @@ def test_listfolders(self):
177177
folders = mh.listsubfolders('deep')
178178
folders.sort()
179179
eq(folders, map(normF, ['deep/f1', 'deep/f2']))
180-
180+
181181
folders = mh.listallsubfolders('deep')
182182
folders.sort()
183183
eq(folders, map(normF, ['deep/f1', 'deep/f2', 'deep/f2/f3']))
@@ -190,22 +190,22 @@ def test_sequence(self):
190190
mh = getMH()
191191
eq = self.assertEquals
192192
writeCurMessage('wide', 55)
193-
193+
194194
f = mh.openfolder('wide')
195195
all = f.listmessages()
196196
eq(all, range(5, 101)+range(101, 201, 2))
197197
eq(f.getcurrent(), 55)
198198
f.setcurrent(99)
199-
eq(readFile(os.path.join(_mhpath, 'wide', '.mh_sequences')),
199+
eq(readFile(os.path.join(_mhpath, 'wide', '.mh_sequences')),
200200
'cur: 99\n')
201201

202202
def seqeq(seq, val):
203203
eq(f.parsesequence(seq), val)
204-
204+
205205
seqeq('5-55', range(5, 56))
206206
seqeq('90-108', range(90, 101)+range(101, 109, 2))
207207
seqeq('90-108', range(90, 101)+range(101, 109, 2))
208-
208+
209209
seqeq('10:10', range(10, 20))
210210
seqeq('10:+10', range(10, 20))
211211
seqeq('101:10', range(101, 121, 2))
@@ -249,7 +249,7 @@ def test_modify(self):
249249
self.assert_("dummy1" in mh.listfolders())
250250
path = os.path.join(_mhpath, "dummy1")
251251
self.assert_(os.path.exists(path))
252-
252+
253253
f = mh.openfolder('dummy1')
254254
def create(n):
255255
msg = "From: foo\nSubject: %s\n\nDummy Message %s\n" % (n,n)
@@ -258,14 +258,14 @@ def create(n):
258258
create(7)
259259
create(8)
260260
create(9)
261-
261+
262262
eq(readFile(f.getmessagefilename(9)),
263263
"From: foo\nSubject: 9\n\nDummy Message 9\n")
264264

265265
eq(f.listmessages(), [7, 8, 9])
266266
files = os.listdir(path)
267267
files.sort()
268-
eq(files, ['7', '8', '9'])
268+
eq(files, ['7', '8', '9'])
269269

270270
f.removemessages(['7', '8'])
271271
files = os.listdir(path)
@@ -275,7 +275,7 @@ def create(n):
275275
create(10)
276276
create(11)
277277
create(12)
278-
278+
279279
mh.makefolder("dummy2")
280280
f2 = mh.openfolder("dummy2")
281281
eq(f2.listmessages(), [])
@@ -285,12 +285,12 @@ def create(n):
285285
eq(f2.listmessages(), [3, 5])
286286
eq(readFile(f2.getmessagefilename(3)),
287287
"From: foo\nSubject: 10\n\nDummy Message 10\n")
288-
288+
289289
f.copymessage(9, f2, 4)
290290
eq(f.listmessages(), [9, 12])
291291
eq(readFile(f2.getmessagefilename(4)),
292292
"From: foo\nSubject: 9\n\nDummy Message 9\n")
293-
293+
294294
f.refilemessages([9, 12], f2)
295295
eq(f.listmessages(), [])
296296
eq(f2.listmessages(), [3, 4, 5, 6, 7])
@@ -306,7 +306,7 @@ def create(n):
306306
def test_read(self):
307307
mh = getMH()
308308
eq = self.assertEquals
309-
309+
310310
f = mh.openfolder('inbox')
311311
msg = f.openmessage(1)
312312
# Check some basic stuff from rfc822
@@ -316,15 +316,15 @@ def test_read(self):
316316
# Okay, we have the right message. Let's check the stuff from
317317
# mhlib.
318318
lines = sortLines(msg.getheadertext())
319-
eq(lines, ["Date: 18 July 2001",
319+
eq(lines, ["Date: 18 July 2001",
320320
"From: Mrs. Premise",
321321
"To: Mrs. Conclusion"])
322322
lines = sortLines(msg.getheadertext(lambda h: len(h)==4))
323-
eq(lines, ["Date: 18 July 2001",
323+
eq(lines, ["Date: 18 July 2001",
324324
"From: Mrs. Premise"])
325325
eq(msg.getbodytext(), "Hullo, Mrs. Conclusion!\n\n")
326326
eq(msg.getbodytext(0), "Hullo, Mrs. Conclusion!\n\n")
327-
327+
328328
# XXXX there should be a better way to reclaim the file handle
329329
msg.fp.close()
330330
del msg

‎Lib/test/test_pkgimport.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def rewrite_file(self, contents):
4343
f = open(self.module_path, 'w')
4444
f.write(contents)
4545
f.close()
46-
46+
4747
def test_package_import__semantics(self):
4848

4949
# Generate a couple of broken modules to try importing.

‎Lib/test/test_repr.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import unittest
77
from test_support import run_unittest
8-
from repr import repr as r # Don't shadow builtin repr
8+
from repr import repr as r # Don't shadow builtin repr
99

1010

1111
def nestedTuple(nesting):
@@ -24,7 +24,7 @@ def test_string(self):
2424
s = "a"*30+"b"*30
2525
expected = `s`[:13] + "..." + `s`[-14:]
2626
eq(r(s), expected)
27-
27+
2828
eq(r("\"'"), repr("\"'"))
2929
s = "\""*30+"'"*100
3030
expected = `s`[:13] + "..." + `s`[-14:]
@@ -67,7 +67,7 @@ def test_instance(self):
6767
eq = self.assertEquals
6868
i1 = ClassWithRepr("a")
6969
eq(r(i1), repr(i1))
70-
70+
7171
i2 = ClassWithRepr("x"*1000)
7272
expected = `i2`[:13] + "..." + `i2`[-14:]
7373
eq(r(i2), expected)

0 commit comments

Comments
 (0)