Skip to content

Commit

Permalink
Cleaned up tabs and space - tabs only now - Python3 ready
Browse files Browse the repository at this point in the history
  • Loading branch information
mahtin committed May 17, 2016
1 parent 2a5fd9b commit 4560bb8
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 33 deletions.
8 changes: 4 additions & 4 deletions CloudFlare/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ def _call_with_certauth(self, method, api_call_part1, api_call_part2=None, api_c
def _call(self, method, headers, api_call_part1, api_call_part2=None, api_call_part3=None, identifier1=None, identifier2=None, params=None, data=None):
if api_call_part2 is not None or (data is not None and method == 'GET'):
if identifier2 is None:
url = self.BASE_URL + '/' + api_call_part1 + '/' + identifier1 + '/' + api_call_part2
url = self.BASE_URL + '/' + api_call_part1 + '/' + identifier1 + '/' + api_call_part2
else:
url = self.BASE_URL + '/' + api_call_part1 + '/' + identifier1 + '/' + api_call_part2 + '/' + identifier2
url = self.BASE_URL + '/' + api_call_part1 + '/' + identifier1 + '/' + api_call_part2 + '/' + identifier2
else:
if identifier1 is None:
url = self.BASE_URL + '/' + api_call_part1
url = self.BASE_URL + '/' + api_call_part1
else:
url = self.BASE_URL + '/' + api_call_part1 + '/' + identifier1
url = self.BASE_URL + '/' + api_call_part1 + '/' + identifier1
if api_call_part3:
url += '/' + api_call_part3

Expand Down
4 changes: 2 additions & 2 deletions CloudFlare/exceptions.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

class CloudFlareError(Exception):
def __init__(self, code, message):
self.code = code
self.message = message
self.code = code
self.message = message

def __int__(self):
return self.code
Expand Down
54 changes: 27 additions & 27 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,36 @@
from setuptools import setup, find_packages

with open('README.rst') as f:
long_description = f.read()
long_description = f.read()

setup(
name='cloudflare',
version='1.0.3',
description='Python wrapper for the CloudFlare v4 API',
long_description=long_description,
author='Martin J. Levy',
author_email='[email protected]',
maintainer='Martin J. Levy',
maintainer_email='[email protected]',
url='https://github.com/cloudflare/python-cloudflare',
license='MIT',
packages=['cli4']+find_packages(),
install_requires=['requests'],
keywords='cloudflare',
entry_points={
'console_scripts': [
'cli4 = cli4.__main__:main'
name='cloudflare',
version='1.0.3',
description='Python wrapper for the CloudFlare v4 API',
long_description=long_description,
author='Martin J. Levy',
author_email='[email protected]',
maintainer='Martin J. Levy',
maintainer_email='[email protected]',
url='https://github.com/cloudflare/python-cloudflare',
license='MIT',
packages=['cli4']+find_packages(),
install_requires=['requests'],
keywords='cloudflare',
entry_points={
'console_scripts': [
'cli4 = cli4.__main__:main'
]
},
classifiers=[
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
'Topic :: Software Development :: Libraries :: Python Modules',
'License :: OSI Approved :: MIT License',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
]
},
classifiers=[
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
'Topic :: Software Development :: Libraries :: Python Modules',
'License :: OSI Approved :: MIT License',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
]
)

package_dir = {'CloudFlare': 'lib'}

0 comments on commit 4560bb8

Please sign in to comment.