Skip to content

Commit 3b3499b

Browse files
ezio-melottiezio-melotti
committed
python#11565: Merge with 3.1.
2 parents cc4a484 + 1392500 commit 3b3499b

File tree

93 files changed

+124
-124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+124
-124
lines changed

‎Doc/includes/sqlite3/shared_cache.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import sqlite3
22

33
# The shared cache is only available in SQLite versions 3.3.3 or later
4-
# See the SQLite documentaton for details.
4+
# See the SQLite documentation for details.
55

66
sqlite3.enable_shared_cache(True)

‎Include/abstract.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
468468
arbitrary data.
469469
470470
0 is returned on success. buffer and buffer_len are only
471-
set in case no error occurrs. Otherwise, -1 is returned and
471+
set in case no error occurs. Otherwise, -1 is returned and
472472
an exception set.
473473
*/
474474

@@ -482,7 +482,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
482482
writable memory location in buffer of size buffer_len.
483483
484484
0 is returned on success. buffer and buffer_len are only
485-
set in case no error occurrs. Otherwise, -1 is returned and
485+
set in case no error occurs. Otherwise, -1 is returned and
486486
an exception set.
487487
*/
488488

‎Include/pymacconfig.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
# endif
6262

6363
# if defined(__LP64__)
64-
/* MacOSX 10.4 (the first release to suppport 64-bit code
64+
/* MacOSX 10.4 (the first release to support 64-bit code
6565
* at all) only supports 64-bit in the UNIX layer.
6666
* Therefore surpress the toolbox-glue in 64-bit mode.
6767
*/

‎Lib/csv.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ def _guess_delimiter(self, data, delimiters):
284284
an all or nothing approach, so we allow for small variations in this
285285
number.
286286
1) build a table of the frequency of each character on every line.
287-
2) build a table of freqencies of this frequency (meta-frequency?),
287+
2) build a table of frequencies of this frequency (meta-frequency?),
288288
e.g. 'x occurred 5 times in 10 rows, 6 times in 1000 rows,
289289
7 times in 2 rows'
290290
3) use the mode of the meta-frequency to determine the /expected/

‎Lib/ctypes/test/test_arrays.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def test_simple(self):
3737
values = [ia[i] for i in range(len(init))]
3838
self.assertEqual(values, [0] * len(init))
3939

40-
# Too many in itializers should be caught
40+
# Too many initializers should be caught
4141
self.assertRaises(IndexError, int_array, *range(alen*2))
4242

4343
CharArray = ARRAY(c_char, 3)

‎Lib/ctypes/test/test_init.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def test_get(self):
2727
self.assertEqual((y.x.a, y.x.b), (0, 0))
2828
self.assertEqual(y.x.new_was_called, False)
2929

30-
# But explicitely creating an X structure calls __new__ and __init__, of course.
30+
# But explicitly creating an X structure calls __new__ and __init__, of course.
3131
x = X()
3232
self.assertEqual((x.a, x.b), (9, 12))
3333
self.assertEqual(x.new_was_called, True)

‎Lib/ctypes/test/test_numbers.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def test_alignments(self):
157157
def test_int_from_address(self):
158158
from array import array
159159
for t in signed_types + unsigned_types:
160-
# the array module doesn't suppport all format codes
160+
# the array module doesn't support all format codes
161161
# (no 'q' or 'Q')
162162
try:
163163
array(t._type_)

‎Lib/ctypes/test/test_win32.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def test_callconv_1(self):
1717
# ValueError: Procedure probably called with not enough arguments (4 bytes missing)
1818
self.assertRaises(ValueError, IsWindow)
1919

20-
# This one should succeeed...
20+
# This one should succeed...
2121
self.assertEqual(0, IsWindow(0))
2222

2323
# ValueError: Procedure probably called with too many arguments (8 bytes in excess)

‎Lib/difflib.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1719,7 +1719,7 @@ def expand_tabs(line):
17191719
line = line.replace(' ','\0')
17201720
# expand tabs into spaces
17211721
line = line.expandtabs(self._tabsize)
1722-
# relace spaces from expanded tabs back into tab characters
1722+
# replace spaces from expanded tabs back into tab characters
17231723
# (we'll replace them with markup after we do differencing)
17241724
line = line.replace(' ','\t')
17251725
return line.replace('\0',' ').rstrip('\n')

‎Lib/distutils/cmd.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ def copy_tree(self, infile, outfile, preserve_mode=1, preserve_times=1,
359359
not self.force, dry_run=self.dry_run)
360360

361361
def move_file (self, src, dst, level=1):
362-
"""Move a file respectin dry-run flag."""
362+
"""Move a file respecting dry-run flag."""
363363
return file_util.move_file(src, dst, dry_run=self.dry_run)
364364

365365
def spawn(self, cmd, search_path=1, level=1):

0 commit comments

Comments
 (0)