[pypy-commit] pypy py3.5: Clean up obsolete code

rlamy pypy.commits at gmail.com
Fri Oct 14 06:25:12 EDT 2016


Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: py3.5
Changeset: r87782:3ac74f32bd23
Date: 2016-10-14 12:24 +0200
http://bitbucket.org/pypy/pypy/changeset/3ac74f32bd23/

Log:	Clean up obsolete code

diff --git a/pypy/tool/release/package.py b/pypy/tool/release/package.py
--- a/pypy/tool/release/package.py
+++ b/pypy/tool/release/package.py
@@ -20,9 +20,6 @@
 import py
 import fnmatch
 import subprocess
-import glob
-
-if sys.version_info < (2,6): py.test.skip("requires 2.6 so far")
 
 USE_ZIPFILE_MODULE = sys.platform == 'win32'
 
@@ -267,11 +264,7 @@
     return retval, builddir # for tests
 
 def package(*args, **kwds):
-    try:
-        import argparse
-    except ImportError:
-        import imp
-        argparse = imp.load_source('argparse', 'lib-python/2.7/argparse.py')
+    import argparse
     if sys.platform == 'win32':
         pypy_exe = 'pypy.exe'
     else:


More information about the pypy-commit mailing list