THRIFT-3596 Better conformance to PEP8
This closes #832
diff --git a/lib/py/setup.py b/lib/py/setup.py
index 090544c..f57c1a1 100644
--- a/lib/py/setup.py
+++ b/lib/py/setup.py
@@ -9,7 +9,7 @@
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
@@ -24,7 +24,7 @@
try:
from setuptools import setup, Extension
except:
- from distutils.core import setup, Extension, Command
+ from distutils.core import setup, Extension
from distutils.command.build_ext import build_ext
from distutils.errors import CCompilerError, DistutilsExecError, DistutilsPlatformError
@@ -41,63 +41,66 @@
else:
ext_errors = (CCompilerError, DistutilsExecError, DistutilsPlatformError)
+
class BuildFailed(Exception):
pass
+
class ve_build_ext(build_ext):
def run(self):
try:
build_ext.run(self)
- except DistutilsPlatformError as x:
+ except DistutilsPlatformError:
raise BuildFailed()
def build_extension(self, ext):
try:
build_ext.build_extension(self, ext)
- except ext_errors as x:
+ except ext_errors:
raise BuildFailed()
+
def run_setup(with_binary):
if with_binary:
extensions = dict(
- ext_modules = [
- Extension('thrift.protocol.fastbinary',
- sources = ['src/protocol/fastbinary.c'],
- include_dirs = include_dirs,
- )
+ ext_modules=[
+ Extension('thrift.protocol.fastbinary',
+ sources=['src/protocol/fastbinary.c'],
+ include_dirs=include_dirs,
+ )
],
cmdclass=dict(build_ext=ve_build_ext)
)
else:
extensions = dict()
- setup(name = 'thrift',
- version = '1.0.0-dev',
- description = 'Python bindings for the Apache Thrift RPC system',
- author = 'Thrift Developers',
- author_email = 'dev@thrift.apache.org',
- url = 'http://thrift.apache.org',
- license = 'Apache License 2.0',
- install_requires=['six>=1.7.2'],
- packages = [
- 'thrift',
- 'thrift.protocol',
- 'thrift.transport',
- 'thrift.server',
- ],
- package_dir = {'thrift' : 'src'},
- classifiers = [
- 'Development Status :: 5 - Production/Stable',
- 'Environment :: Console',
- 'Intended Audience :: Developers',
- 'Programming Language :: Python',
- 'Programming Language :: Python :: 2',
- 'Programming Language :: Python :: 3',
- 'Topic :: Software Development :: Libraries',
- 'Topic :: System :: Networking'
- ],
- **extensions
- )
+ setup(name='thrift',
+ version='1.0.0-dev',
+ description='Python bindings for the Apache Thrift RPC system',
+ author='Thrift Developers',
+ author_email='dev@thrift.apache.org',
+ url='http://thrift.apache.org',
+ license='Apache License 2.0',
+ install_requires=['six>=1.7.2'],
+ packages=[
+ 'thrift',
+ 'thrift.protocol',
+ 'thrift.transport',
+ 'thrift.server',
+ ],
+ package_dir={'thrift': 'src'},
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: Console',
+ 'Intended Audience :: Developers',
+ 'Programming Language :: Python',
+ 'Programming Language :: Python :: 2',
+ 'Programming Language :: Python :: 3',
+ 'Topic :: Software Development :: Libraries',
+ 'Topic :: System :: Networking'
+ ],
+ **extensions
+ )
try:
with_binary = False