aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>2012-07-25 05:11:56 +0200
committerArfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>2012-07-25 05:11:56 +0200
commit4084ebc22ff58d406b73fe25c069b5235f04c4d8 (patch)
treed1a96789ee6f17c37b52d575621457b2ec55b646
parentbe5acb407cfa5dd1ff37ac1ed68d96ba92302cc2 (diff)
downloadexternal_python_setuptools-4084ebc22ff58d406b73fe25c069b5235f04c4d8.tar.gz
external_python_setuptools-4084ebc22ff58d406b73fe25c069b5235f04c4d8.tar.bz2
external_python_setuptools-4084ebc22ff58d406b73fe25c069b5235f04c4d8.zip
Issue #283: Reenable scanning of *.pyc / *.pyo files on Python 3.3.
Scanning of these files was fixed in commit 2479772eeea7. --HG-- branch : distribute extra : rebase_source : fcbb14f0e6efc2c42b691fa2a8920816903ede42
-rw-r--r--CHANGES.txt11
-rw-r--r--setuptools/command/bdist_egg.py2
2 files changed, 8 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 14f26d26..a08cba78 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,14 +3,19 @@ CHANGES
=======
------
+0.6.29
+------
+
+* Issue #283: Reenable scanning of *.pyc / *.pyo files on Python 3.3.
+
+------
0.6.28
------
-* Issue 294: setup.py can now be invoked from any directory.
+* Issue #294: setup.py can now be invoked from any directory.
* Scripts are now installed honoring the umask.
* Added support for .dist-info directories.
-* Issue #283 bdist_egg issues with python 3.3.0aX.
-* Test and fix for marshal.load of .pyc files on Python 3.3.
+* Issue #283: Fix and disable scanning of *.pyc / *.pyo files on Python 3.3.
------
0.6.27
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index cf2d75e4..0ee9c55b 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -463,8 +463,6 @@ def iter_symbols(code):
yield name
def can_scan():
- if sys.version_info > (3, 3):
- return False # Can't scan recent formats
if not sys.platform.startswith('java') and sys.platform != 'cli':
# CPython, PyPy, etc.
return True