summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-01-13 14:17:24 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-01-13 14:17:24 (GMT)
commit82f34ada45f96c13eb68927d6beccdcbab2c77b3 (patch)
tree136839c19a7d640d61b84b04129a76e0063b87ba /Lib
parent38dc250521d2c34f58537b25301a0ac9a4bb6c85 (diff)
downloadcpython-82f34ada45f96c13eb68927d6beccdcbab2c77b3.zip
cpython-82f34ada45f96c13eb68927d6beccdcbab2c77b3.tar.gz
cpython-82f34ada45f96c13eb68927d6beccdcbab2c77b3.tar.bz2
fix instances of consecutive articles (closes #23221)
Patch by Karan Goel.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/distutils/dir_util.py2
-rw-r--r--Lib/http/cookiejar.py2
-rw-r--r--Lib/lib2to3/fixes/fix_exitfunc.py2
-rw-r--r--Lib/socket.py2
-rw-r--r--Lib/test/test_argparse.py2
5 files changed, 5 insertions, 5 deletions
diff --git a/Lib/distutils/dir_util.py b/Lib/distutils/dir_util.py
index 0924c9b..d5cd8e3 100644
--- a/Lib/distutils/dir_util.py
+++ b/Lib/distutils/dir_util.py
@@ -81,7 +81,7 @@ def create_tree(base_dir, files, mode=0o777, verbose=1, dry_run=0):
"""Create all the empty directories under 'base_dir' needed to put 'files'
there.
- 'base_dir' is just the a name of a directory which doesn't necessarily
+ 'base_dir' is just the name of a directory which doesn't necessarily
exist yet; 'files' is a list of filenames to be interpreted relative to
'base_dir'. 'base_dir' + the directory portion of every file in 'files'
will be created if it doesn't already exist. 'mode', 'verbose' and
diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py
index 2ddd523..7e4982f 100644
--- a/Lib/http/cookiejar.py
+++ b/Lib/http/cookiejar.py
@@ -1792,7 +1792,7 @@ class FileCookieJar(CookieJar):
def lwp_cookie_str(cookie):
- """Return string representation of Cookie in an the LWP cookie file format.
+ """Return string representation of Cookie in the LWP cookie file format.
Actually, the format is extended a bit -- see module docstring.
diff --git a/Lib/lib2to3/fixes/fix_exitfunc.py b/Lib/lib2to3/fixes/fix_exitfunc.py
index 9afc2fa..2e47887 100644
--- a/Lib/lib2to3/fixes/fix_exitfunc.py
+++ b/Lib/lib2to3/fixes/fix_exitfunc.py
@@ -35,7 +35,7 @@ class FixExitfunc(fixer_base.BaseFix):
self.sys_import = None
def transform(self, node, results):
- # First, find a the sys import. We'll just hope it's global scope.
+ # First, find the sys import. We'll just hope it's global scope.
if "sys_import" in results:
if self.sys_import is None:
self.sys_import = results["sys_import"]
diff --git a/Lib/socket.py b/Lib/socket.py
index 22d7ad5..8efd760 100644
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -299,7 +299,7 @@ if hasattr(_socket.socket, "share"):
def fromshare(info):
""" fromshare(info) -> socket object
- Create a socket object from a the bytes object returned by
+ Create a socket object from the bytes object returned by
socket.share(pid).
"""
return socket(0, 0, 0, info)
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index 98ccfe4..1164f3f 100644
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -644,7 +644,7 @@ class TestOptionalsChoices(ParserTestCase):
class TestOptionalsRequired(ParserTestCase):
- """Tests the an optional action that is required"""
+ """Tests an optional action that is required"""
argument_signatures = [
Sig('-x', type=int, required=True),