summaryrefslogtreecommitdiffstats
path: root/Lib/io.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2009-03-04 11:18:52 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2009-03-04 11:18:52 (GMT)
commit1fcadcef408d788b1896ea3d9b4308c1f4c64d12 (patch)
treedc84a82c3f1e20b002657a7430ff9edbe83d53d7 /Lib/io.py
parent7fb111bb9e53324a622c0cf87fdbaeda288b947a (diff)
downloadcpython-1fcadcef408d788b1896ea3d9b4308c1f4c64d12.zip
cpython-1fcadcef408d788b1896ea3d9b4308c1f4c64d12.tar.gz
cpython-1fcadcef408d788b1896ea3d9b4308c1f4c64d12.tar.bz2
Fix failures introduced by buggy merge (2)
Diffstat (limited to 'Lib/io.py')
-rw-r--r--Lib/io.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/io.py b/Lib/io.py
index a185a18..978e833 100644
--- a/Lib/io.py
+++ b/Lib/io.py
@@ -47,7 +47,7 @@ __author__ = ("Guido van Rossum <guido@python.org>, "
"Mike Verdone <mike.verdone@gmail.com>, "
"Mark Russell <mark.russell@zen.co.uk>, "
"Antoine Pitrou <solipsis@pitrou.net>, "
- "Amaury Forgeotdarc <amauryfa@gmail.com>")
+ "Amaury Forgeot d'Arc <amauryfa@gmail.com>")
__all__ = ["BlockingIOError", "open", "IOBase", "RawIOBase", "FileIO",
"BytesIO", "StringIO", "BufferedIOBase",