mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-23 18:04:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Whitespace normalization.

Browse Source
This commit is contained in:
Tim Peters 2001-02-28 08:26:44 +00:00
parent 8de0c1716b
commit 85ba673b0a
6 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/__future__.py
View File

@ -24,18 +24,18 @@ OptionalRelease records the first release in which
was accepted.
In the case of MandatoryReleases that have not yet occurred,
MandatoryRelease predicts the release in which the feature will become part
In the case of MandatoryReleases that have not yet occurred,
MandatoryRelease predicts the release in which the feature will become part
of the language.
Else MandatoryRelease records when the feature became part of the language;
Else MandatoryRelease records when the feature became part of the language;
in releases at or after that, modules no longer need
from __future__ import FeatureName
to use the feature in question, but may continue to use such imports.
MandatoryRelease may also be None, meaning that a planned feature got
MandatoryRelease may also be None, meaning that a planned feature got
dropped.
No line is ever to be deleted from this file.

2
Lib/inspect.py
View File

@ -612,5 +612,5 @@ def stack(context=1):
return getouterframes(currentframe().f_back, context)
def trace(context=1):
"""Return a list of records for the stack below the current exception."""
"""Return a list of records for the stack below the current exception."""
return getinnerframes(sys.exc_traceback, context)

4
Lib/pydoc.py
View File

@ -445,7 +445,7 @@ class HTMLDoc(Doc):
modpkgs.append((modname, name, 0, 0))
modnames.append(modname)
elif ispackage(path):
modpkgs.append((file, name, 1, 0))
modpkgs.append((file, name, 1, 0))
modpkgs.sort()
contents = self.multicolumn(modpkgs, self.modpkglink)
result = result + self.bigsection(
@ -576,7 +576,7 @@ class HTMLDoc(Doc):
if ispackage(path): found(file, 1)
for file in files:
path = os.path.join(dir, file)
if file[:1] != '_' and os.path.isfile(path):
if file[:1] != '_' and os.path.isfile(path):
modname = modulename(file)
if modname: found(modname, 0)

1
Lib/test/test_global.py
View File

@ -37,4 +37,3 @@ def wrong3():
global x
"""
compile_and_catch_warning(prog_text_3)

6
Lib/urllib.py
View File

@ -561,17 +561,17 @@ class FancyURLopener(URLopener):
See this URL for a description of the basic authentication scheme:
http://www.ics.uci.edu/pub/ietf/http/draft-ietf-http-v10-spec-00.txt"""
if not headers.has_key('www-authenticate'):
URLopener.http_error_default(self, url, fp,
URLopener.http_error_default(self, url, fp,
errmsg, headers)
stuff = headers['www-authenticate']
import re
match = re.match('[ \t]*([^ \t]+)[ \t]+realm="([^"]*)"', stuff)
if not match:
URLopener.http_error_default(self, url, fp,
URLopener.http_error_default(self, url, fp,
errcode, errmsg, headers)
scheme, realm = match.groups()
if scheme.lower() != 'basic':
URLopener.http_error_default(self, url, fp,
URLopener.http_error_default(self, url, fp,
errcode, errmsg, headers)
name = 'retry_' + self.type + '_basic_auth'
if data is None:

2
Lib/webbrowser.py
View File

@ -154,7 +154,7 @@ if os.environ.get("TERM") or os.environ.get("DISPLAY"):
def open(self, url, new=1, autoraise=1):
# XXX Currently I know no way to prevent KFM from
# opening a new win.
# opening a new win.
self._remote("openURL %s" % url)
# Deprecated. May be removed in 2.1.