[Python-checkins] r69676 - in python/branches/py3k/Lib: modulefinder.py pkgutil.py subprocess.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Mon Feb 16 17:20:10 2009
New Revision: 69676

Log:
no 2.3 compat in the py3k lib #3676

Modified:
   python/branches/py3k/Lib/modulefinder.py
   python/branches/py3k/Lib/pkgutil.py
   python/branches/py3k/Lib/subprocess.py

Modified: python/branches/py3k/Lib/modulefinder.py
==============================================================================
--- python/branches/py3k/Lib/modulefinder.py	(original)
+++ python/branches/py3k/Lib/modulefinder.py	Mon Feb 16 17:20:10 2009
@@ -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 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')])

Modified: python/branches/py3k/Lib/pkgutil.py
==============================================================================
--- python/branches/py3k/Lib/pkgutil.py	(original)
+++ python/branches/py3k/Lib/pkgutil.py	Mon Feb 16 17:20:10 2009
@@ -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

Modified: python/branches/py3k/Lib/subprocess.py
==============================================================================
--- python/branches/py3k/Lib/subprocess.py	(original)
+++ python/branches/py3k/Lib/subprocess.py	Mon Feb 16 17:20:10 2009
@@ -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 at lysator.liu.se>
 #
 # Licensed to PSF under a Contributor Agreement.