summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-05-25 16:22:11 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-05-25 16:22:11 (GMT)
commit0f67a99fc982ebad6b489a319c2ac521d64ea11e (patch)
tree9893faddaac9028b054c3e652b0e0c43c1af08a8 /Tools
parent559b5f1ca0a5dec9d485f01895b61e3d7da5075c (diff)
parent17b60f0367db0ae8cd6d4ce6a6ea8330b4802029 (diff)
downloadcpython-0f67a99fc982ebad6b489a319c2ac521d64ea11e.zip
cpython-0f67a99fc982ebad6b489a319c2ac521d64ea11e.tar.gz
cpython-0f67a99fc982ebad6b489a319c2ac521d64ea11e.tar.bz2
Branch merge
Diffstat (limited to 'Tools')
-rwxr-xr-xTools/scripts/findnocoding.py4
-rw-r--r--Tools/scripts/pysource.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/Tools/scripts/findnocoding.py b/Tools/scripts/findnocoding.py
index 77607ce..c42fa7c 100755
--- a/Tools/scripts/findnocoding.py
+++ b/Tools/scripts/findnocoding.py
@@ -2,7 +2,7 @@
"""List all those Python files that require a coding directive
-Usage: nocoding.py dir1 [dir2...]
+Usage: findnocoding.py dir1 [dir2...]
"""
__author__ = "Oleg Broytmann, Georg Brandl"
@@ -50,7 +50,7 @@ def has_correct_encoding(text, codec):
def needs_declaration(fullpath):
try:
- infile = open(fullpath, 'rU')
+ infile = open(fullpath)
except IOError: # Oops, the file was removed - ignore it
return None
diff --git a/Tools/scripts/pysource.py b/Tools/scripts/pysource.py
index 048131e..c7dbe60 100644
--- a/Tools/scripts/pysource.py
+++ b/Tools/scripts/pysource.py
@@ -42,7 +42,7 @@ def _open(fullpath):
return None
try:
- return open(fullpath, 'rU')
+ return open(fullpath)
except IOError as err: # Access denied, or a special file - ignore it
print_debug("%s: access denied: %s" % (fullpath, err))
return None