Merged revisions 69846 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r69846 | mark.dickinson | 2009-02-21 20:27:01 +0000 (Sat, 21 Feb 2009) | 2 lines
Issue #5341: Fix a variety of spelling errors.
........
diff --git a/Lib/test/test_calendar.py b/Lib/test/test_calendar.py
index 5debee9..e8b2ca5 100644
--- a/Lib/test/test_calendar.py
+++ b/Lib/test/test_calendar.py
@@ -170,7 +170,7 @@
class OutputTestCase(unittest.TestCase):
def normalize_calendar(self, s):
- # Filters out locale dependant strings
+ # Filters out locale dependent strings
def neitherspacenordigit(c):
return not c.isspace() and not c.isdigit()
diff --git a/Lib/test/test_cfgparser.py b/Lib/test/test_cfgparser.py
index dcc1a98..a8418ca 100644
--- a/Lib/test/test_cfgparser.py
+++ b/Lib/test/test_cfgparser.py
@@ -82,11 +82,11 @@
# Make sure the right things happen for remove_option();
# added to include check for SourceForge bug #123324:
self.failUnless(cf.remove_option('Foo Bar', 'foo'),
- "remove_option() failed to report existance of option")
+ "remove_option() failed to report existence of option")
self.failIf(cf.has_option('Foo Bar', 'foo'),
"remove_option() failed to remove option")
self.failIf(cf.remove_option('Foo Bar', 'foo'),
- "remove_option() failed to report non-existance of option"
+ "remove_option() failed to report non-existence of option"
" that was removed")
self.assertRaises(configparser.NoSectionError,
@@ -254,7 +254,7 @@
file1 = support.findfile("cfgparser.1")
# check when we pass a mix of readable and non-readable files:
cf = self.newconfig()
- parsed_files = cf.read([file1, "nonexistant-file"])
+ parsed_files = cf.read([file1, "nonexistent-file"])
self.assertEqual(parsed_files, [file1])
self.assertEqual(cf.get("Foo Bar", "foo"), "newbar")
# check when we pass only a filename:
@@ -264,7 +264,7 @@
self.assertEqual(cf.get("Foo Bar", "foo"), "newbar")
# check when we pass only missing files:
cf = self.newconfig()
- parsed_files = cf.read(["nonexistant-file"])
+ parsed_files = cf.read(["nonexistent-file"])
self.assertEqual(parsed_files, [])
# check when we pass no files:
cf = self.newconfig()
diff --git a/Lib/test/test_codeccallbacks.py b/Lib/test/test_codeccallbacks.py
index 549a348..56f3ac1 100644
--- a/Lib/test/test_codeccallbacks.py
+++ b/Lib/test/test_codeccallbacks.py
@@ -109,7 +109,7 @@
# useful that the error handler is not called for every single
# unencodable character, but for a complete sequence of
# unencodable characters, otherwise we would output many
- # unneccessary escape sequences.
+ # unnecessary escape sequences.
def uninamereplace(exc):
if not isinstance(exc, UnicodeEncodeError):
diff --git a/Lib/test/test_descrtut.py b/Lib/test/test_descrtut.py
index 11a3422..2db3d33 100644
--- a/Lib/test/test_descrtut.py
+++ b/Lib/test/test_descrtut.py
@@ -54,7 +54,7 @@
{1: 3.25}
>>> print(a[1]) # show the new item
3.25
- >>> print(a[0]) # a non-existant item
+ >>> print(a[0]) # a non-existent item
0.0
>>> a.merge({1:100, 2:200}) # use a dict method
>>> print(sortdict(a)) # show the result
diff --git a/Lib/test/test_funcattrs.py b/Lib/test/test_funcattrs.py
index 7aab8b8..5e47d6b 100644
--- a/Lib/test/test_funcattrs.py
+++ b/Lib/test/test_funcattrs.py
@@ -167,7 +167,7 @@
def test_unset_attr(self):
for func in [self.b, self.fi.a]:
- try: func.non_existant_attr
+ try: func.non_existent_attr
except AttributeError: pass
else: self.fail("using unknown attributes should raise "
"AttributeError")
diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py
index 16ca301..4529a8f 100644
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@ -99,7 +99,7 @@
def test_ftp(self):
urls = [
'ftp://ftp.kernel.org/pub/linux/kernel/README',
- 'ftp://ftp.kernel.org/pub/linux/kernel/non-existant-file',
+ 'ftp://ftp.kernel.org/pub/linux/kernel/non-existent-file',
#'ftp://ftp.kernel.org/pub/leenox/kernel/test',
'ftp://gatekeeper.research.compaq.com/pub/DEC/SRC'
'/research-reports/00README-Legal-Rules-Regs',