diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-02-16 16:20:10 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-02-16 16:20:10 (GMT) |
| commit | 821d0f8b1f7666d1bc85ffdc8ca9cd4a64eaec17 (patch) | |
| tree | 90947a9a2802b4aeb80786890e94b8d18eb270af | |
| parent | b7851694e0bcfad81844021da0dead4d0948c651 (diff) | |
| download | cpython-821d0f8b1f7666d1bc85ffdc8ca9cd4a64eaec17.zip cpython-821d0f8b1f7666d1bc85ffdc8ca9cd4a64eaec17.tar.gz cpython-821d0f8b1f7666d1bc85ffdc8ca9cd4a64eaec17.tar.bz2 | |
no 2.3 compat in the py3k lib #3676
| -rw-r--r-- | Lib/modulefinder.py | 7 | ||||
| -rw-r--r-- | Lib/pkgutil.py | 3 | ||||
| -rw-r--r-- | Lib/subprocess.py | 2 |
3 files changed, 1 insertions, 11 deletions
diff --git a/Lib/modulefinder.py b/Lib/modulefinder.py index 989172a..478c749 100644 --- a/Lib/modulefinder.py +++ b/Lib/modulefinder.py @@ -1,5 +1,4 @@ """Find modules used by a script, using introspection.""" -# This module should be kept compatible with Python 2.2, see PEP 291. from __future__ import generators import dis @@ -10,11 +9,7 @@ import sys import types import struct -if hasattr(sys.__stdout__, "newlines"): - READ_MODE = "U" # universal line endings -else: - # remain compatible with Python < 2.3 - READ_MODE = "r" +READ_MODE = "rU" # XXX Clean up once str8's cstor matches bytes. LOAD_CONST = bytes([dis.opname.index('LOAD_CONST')]) diff --git a/Lib/pkgutil.py b/Lib/pkgutil.py index ff3467a..27dd887 100644 --- a/Lib/pkgutil.py +++ b/Lib/pkgutil.py @@ -1,8 +1,5 @@ """Utilities to support packages.""" -# NOTE: This module must remain compatible with Python 2.3, as it is shared -# by setuptools for distribution with Python 2.3 and up. - import os import sys import imp diff --git a/Lib/subprocess.py b/Lib/subprocess.py index b47ebb8..391edca 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -2,8 +2,6 @@ # # For more information about this module, see PEP 324. # -# This module should remain compatible with Python 2.2, see PEP 291. -# # Copyright (c) 2003-2005 by Peter Astrand <astrand@lysator.liu.se> # # Licensed to PSF under a Contributor Agreement. |