mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Branch merge

This commit is contained in:
Éric Araujo 2011-05-25 18:22:11 +02:00
parent 559b5f1ca0 17b60f0367
commit 0f67a99fc9
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Doc/library/site.rst
View File

@ -129,6 +129,10 @@ empty, and the path manipulations are skipped; however the import of
unless the :program:`python` interpreter was started with the :option:`-S` unless the :program:`python` interpreter was started with the :option:`-S`
flag. flag.
.. versionchanged:: 3.3
This function used to be called unconditionnally.
.. function:: addsitedir(sitedir, known_paths=None) .. function:: addsitedir(sitedir, known_paths=None)
Adds a directory to sys.path and processes its pth files. Adds a directory to sys.path and processes its pth files.

4
Tools/scripts/findnocoding.py
View File

@ -2,7 +2,7 @@
"""List all those Python files that require a coding directive """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" __author__ = "Oleg Broytmann, Georg Brandl"
@ -50,7 +50,7 @@ def has_correct_encoding(text, codec):
def needs_declaration(fullpath): def needs_declaration(fullpath):
try: try:
infile = open(fullpath, 'rU') infile = open(fullpath)
except IOError: # Oops, the file was removed - ignore it except IOError: # Oops, the file was removed - ignore it
return None return None

2
Tools/scripts/pysource.py
View File

@ -42,7 +42,7 @@ def _open(fullpath):
return None return None
try: try:
return open(fullpath, 'rU') return open(fullpath)
except IOError as err: # Access denied, or a special file - ignore it except IOError as err: # Access denied, or a special file - ignore it
print_debug("%s: access denied: %s" % (fullpath, err)) print_debug("%s: access denied: %s" % (fullpath, err))
return None return None