Remove support for Python releases older than 2.6

setup.py

@@ -26,13 +26,10 @@
 from distutils import core, dir_util, file_util
 from distutils.core import Extension
 from distutils.util import get_platform
-from distutils.command.build_ext import build_ext
-import glob
-import os
 import sys
 
-if sys.version[0:1] == '1':
- raise RuntimeError("pyscard requires Python 2.x to build.")
+if sys.version_info[0:2] < (2, 6):
+ raise RuntimeError("pyscard requires Python 2.6+ to build.")
 
 if 'win32' == get_platform():
  platform__cc_defines = [('WIN32', '100')]
@@ -61,27 +58,6 @@
  platform_extra_compile_args = []
  platform_extra_link_args = []
 
-#
-# Mac OS X Tiger has python 2.3 preinstalled
-# get_platform() returns a string similar to 'darwin-8.11.1-i386' with
-# python 2.3
-# if python 2.5 is installed, get_platform() returns a string similar to
-# 'macosx-10.3-fat'
-elif 'darwin' in get_platform() \
- or 'macosx-10.3' in get_platform() \
- or 'macosx-10.4' in get_platform():
- platform__cc_defines = [('PCSCLITE', '1'),
- ('__APPLE__', '1'),
- ('__TIGER__', '1')]
- platform_swig_opts = ['-DPCSCLITE', '-D__APPLE__', '-D__TIGER__']
- platform_sources = []
- platform_libraries = []
- platform_include_dirs = []
- platform_extra_compile_args = ['-v', '-framework', 'PCSC',
- '-arch', 'i386', '-arch',
- 'ppc', '-ggdb', '-O0']
- platform_extra_link_args = ['-arch', 'i386', '-arch', 'ppc', '-ggdb']
-
 #
 # Mac OS X Lion (and above), python 2.7
 # PowerPC is no more supported, x86_64 is new
@@ -116,23 +92,6 @@
  '-arch', 'x86_64', '-ggdb']
  platform_extra_link_args = ['-arch', 'i386', '-arch', 'x86_64', '-ggdb']
 
-#
-# Mac OS X Leopard has python 2.5 preinstalled
-# get_platform() returns a string similar to 'macosx-10.5-i386'
-#
-elif 'macosx-10.5' in get_platform():
- platform__cc_defines = [('PCSCLITE', '1'),
- ('__APPLE__', '1'),
- ('__LEOPARD__', '1')]
- platform_swig_opts = ['-DPCSCLITE', '-D__APPLE__', '-D__LEOPARD__']
- platform_sources = []
- platform_libraries = []
- platform_include_dirs = []
- platform_extra_compile_args = ['-v', '-framework', 'PCSC',
- '-arch', 'i386',
- '-arch', 'ppc', '-ggdb', '-O0']
- platform_extra_link_args = ['-arch', 'i386', '-arch', 'ppc', '-ggdb']
-#
 # Other (GNU/Linux, etc.)
 #
 else:
@@ -145,65 +104,6 @@
  platform_extra_link_args = [] # ['-ggdb']
 
 
-class _pyscardBuildExt(build_ext):
- '''Specialization of build_ext to enable swig_opts
- for python 2.3 distutils'''
-if sys.version_info < (2, 4):
-
- # This copy of swig_sources is from Python 2.3.
- # This is to add support of swig_opts for Python 2.3 distutils
- # (in particular for MacOS X darwin that comes with Python 2.3)
-
- def swig_sources(self, sources):
-
- """Walk the list of source files in 'sources', looking for SWIG
- interface (.i) files. Run SWIG on all that are found, and
- return a modified 'sources' list with SWIG source files replaced
- by the generated C (or C++) files.
- """
-
- new_sources = []
- swig_sources = []
- swig_targets = {}
-
- # XXX this drops generated C/C++ files into the source tree, which
- # is fine for developers who want to distribute the generated
- # source -- but there should be an option to put SWIG output in
- # the temp dir.
-
- if self.swig_cpp:
- target_ext = '.cpp'
- else:
- target_ext = '.c'
-
- for source in sources:
- (base, ext) = os.path.splitext(source)
- if ext == ".i": # SWIG interface file
- new_sources.append(base + target_ext)
- swig_sources.append(source)
- swig_targets[source] = new_sources[-1]
- else:
- new_sources.append(source)
-
- if not swig_sources:
- return new_sources
-
- swig = self.find_swig()
- swig_cmd = [swig, "-python"]
- if self.swig_cpp:
- swig_cmd.append("-c++")
-
- swig_cmd += platform_swig_opts
-
- for source in swig_sources:
- target = swig_targets[source]
- self.announce("swigging %s to %s" % (source, target))
- self.spawn(swig_cmd + ["-o", target, source])
-
- return new_sources
-
- build_ext.swig_sources = swig_sources
-
 kw = {'name': "pyscard",
  'version': "1.6.16",
  'description': "Smartcard module for Python.",
@@ -248,42 +148,20 @@ def swig_sources(self, sources):
  swig_opts=['-outdir',
  'smartcard/scard'] \
  + platform_swig_opts)],
- 'cmdclass': {'build_ext': _pyscardBuildExt},
- }
-
-# If we're running >Python 2.3, add extra information
-if hasattr(core, 'setup_keywords'):
- if 'classifiers' in core.setup_keywords:
- kw['classifiers'] = [
+ 'classifiers': [
  'Development Status :: 1.6.16 - Release',
  'License :: GNU LESSER GENERAL PUBLIC LICENSE',
  'Intended Audience :: Developers',
  'Operating System :: Unix',
  'Operating System :: Microsoft :: Windows',
  'Topic :: Security :: Smartcards',
  ]
- if 'download_url' in core.setup_keywords:
- kw['download_url'] = ('http:https://sourceforge.net/projects/pyscard/'
- '%s-%s.zip' % (kw['name'], kw['version']))
+ }
 
+# FIXME Sourceforge downloads are unauthenticated, migrate to PyPI
+kw['download_url'] = ('http:https://sourceforge.net/projects/%(name)s/files'
+ '/%(name)s/%(name)s%%20%(version)s'
+ '/%(name)s-%(version)s.tar.gz/download' % kw)
 
 pyscard_dist = core.setup(**kw)
 
-
-# Python 2.3 distutils does not support package_data
-# copy manually package_data
-if sys.version_info < (2, 4):
- from distutils.util import convert_path
- from glob import glob
- if "install" in sys.argv:
- targetdir = pyscard_dist.command_obj['install'].install_purelib
- package_data = kw['package_data']
- files = []
- for directory in package_data:
- for pattern in package_data[directory]:
- filelist = glob(os.path.join(directory, convert_path(pattern)))
- files.extend([fn for fn in filelist if fn not in files])
- for file in files:
- newdir = os.path.dirname(file)
- dir_util.mkpath(os.path.join(targetdir, newdir))
- file_util.copy_file(file, os.path.join(targetdir, file))