From a9d0533a1cafadee050a05520139a1ea1948cc4e Mon Sep 17 00:00:00 2001 From: PyYoshi Date: Mon, 17 Oct 2016 14:36:43 +0900 Subject: [PATCH] reformat --- setup.py | 69 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/setup.py b/setup.py index 2716e91..65beea4 100644 --- a/setup.py +++ b/setup.py @@ -13,8 +13,10 @@ except ImportError: from distutils.core import setup, Extension import glob + try: import Cython.Compiler.Main as cython_compiler + have_cython = True except ImportError: have_cython = False @@ -31,51 +33,52 @@ else: DEBUG = False src_dir = 'src' -ext_dir = os.path.join(src_dir,'ext') +ext_dir = os.path.join(src_dir, 'ext') build_dir = 'build' -cchardet_dir = os.path.join(src_dir,'cchardet/') +cchardet_dir = os.path.join(src_dir, 'cchardet/') charsetdetect_dir = os.path.join(ext_dir, 'libcharsetdetect/') -nspr_emu_dir = os.path.join(charsetdetect_dir,"nspr-emu/") -uchardet_dir = os.path.join(charsetdetect_dir,"mozilla/extensions/universalchardet/src/base/") +nspr_emu_dir = os.path.join(charsetdetect_dir, 'nspr-emu/') +uchardet_dir = os.path.join(charsetdetect_dir, 'mozilla/extensions/universalchardet/src/base/') if have_cython: - pyx_sources = glob.glob(cchardet_dir+'*.pyx') - sys.stderr.write("cythonize: %r\n" % (pyx_sources,)) - cython_compiler.compile(pyx_sources,options=cython_compiler.CompilationOptions(cplus=True)) -cchardet_sources = glob.glob(cchardet_dir+'*.cpp') -sources = cchardet_sources + [os.path.join(charsetdetect_dir,"charsetdetect.cpp")] + glob.glob(uchardet_dir+'*.cpp') + pyx_sources = glob.glob(cchardet_dir + '*.pyx') + sys.stderr.write('cythonize: %r\n' % (pyx_sources,)) + cython_compiler.compile(pyx_sources, options=cython_compiler.CompilationOptions(cplus=True)) +cchardet_sources = glob.glob(cchardet_dir + '*.cpp') +sources = cchardet_sources + [os.path.join(charsetdetect_dir, 'charsetdetect.cpp')] + glob.glob(uchardet_dir + '*.cpp') macros = [] extra_compile_args = [] extra_link_args = [] -if platform.system() == "Windows": - macros.append(("WIN32","1")) +if platform.system() == 'Windows': + macros.append(('WIN32', '1')) if DEBUG: - macros.append(("DEBUG_chardet","1")) - extra_compile_args.append("-g"), - extra_link_args.append("-g"), + macros.append(('DEBUG_chardet', '1')) + extra_compile_args.append('-g'), + extra_link_args.append('-g'), -cchardet_module = Extension("cchardet._cchardet", - sources = sources, - include_dirs = [uchardet_dir,nspr_emu_dir,charsetdetect_dir], - language = "c++", +cchardet_module = Extension( + 'cchardet._cchardet', + sources=sources, + include_dirs=[uchardet_dir, nspr_emu_dir, charsetdetect_dir], + language='c++', define_macros=macros, ) setup( - name = 'cchardet', - author = 'PyYoshi', - author_email = 'myoshi321go_at_gmail_dot_com', - url = r"https://github.com/PyYoshi/cChardet", - description = 'Universal encoding detector. This library is faster than chardet.', - long_description= """cChardet is high speed universal character encoding detector. - binding to charsetdetect. + name='cchardet', + author='PyYoshi', + author_email='myoshi321go_at_gmail_dot_com', + url=r'https://github.com/PyYoshi/cChardet', + description='Universal encoding detector. This library is faster than chardet.', + long_description='''cChardet is high speed universal character encoding detector. - binding to charsetdetect. This library is faster than chardet. -""", - version = '1.0.0', - license = 'MIT License', - classifiers = [ +''', + version='1.0.0', + license='MIT License', + classifiers=[ 'License :: OSI Approved :: MIT License', 'Programming Language :: Cython', 'Programming Language :: Python', @@ -83,15 +86,15 @@ This library is faster than chardet. 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 3', ], - keywords = [ + keywords=[ 'cython', 'chardet', 'charsetdetect' ], - cmdclass = {'build_ext': build_ext}, - package_dir = {"":src_dir}, - packages = ['cchardet',], - ext_modules = [ + cmdclass={'build_ext': build_ext}, + package_dir={'': src_dir}, + packages=['cchardet', ], + ext_modules=[ cchardet_module ], )