Skip to content
This repository was archived by the owner on Nov 22, 2024. It is now read-only.

Commit 0e7bbec

Browse files
mahtinmahtin
committed
cleanup of _content_type value - not needed if None, which is the default
1 parent 07348fe commit 0e7bbec

1 file changed

Lines changed: 39 additions & 20 deletions

File tree

‎CloudFlare/cloudflare.py‎

Lines changed: 39 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def __del__(self):
6868
del self.network
6969
self.network = None
7070

71-
def _add_headers(self, method, content_type, data, files):
71+
def _add_headers(self, method, data, files, content_type=None):
7272
""" Add default headers """
7373
self.headers = {}
7474
self.headers['User-Agent'] = self.user_agent
@@ -182,47 +182,47 @@ def _add_certtoken_headers(self, method):
182182
raise CloudFlareAPIError(0, 'no cert token defined')
183183
self.headers['X-Auth-User-Service-Key'] = api_certtoken
184184

185-
def do_not_available(self, method, parts, identifiers, params=None, data=None, content_type=None, files=None):
185+
def do_not_available(self, method, parts, identifiers, params=None, data=None, files=None, content_type=None):
186186
""" Cloudflare v4 API"""
187187

188188
# base class simply returns not available - no processing of any arguments
189189
if self.logger:
190190
self.logger.debug('call for this method not available')
191191
raise CloudFlareAPIError(0, 'call for this method not available')
192192

193-
def do_no_auth(self, method, parts, identifiers, params=None, data=None, content_type=None, files=None):
193+
def do_no_auth(self, method, parts, identifiers, params=None, data=None, files=None, content_type=None):
194194
""" Cloudflare v4 API"""
195195

196-
data, files = self._add_headers(method, content_type, data, files)
196+
data, files = self._add_headers(method, data, files, content_type)
197197
# We decide at this point if we are sending json or string data
198198
if isinstance(data, (str,bytes,bytearray)):
199199
return self._call(method, parts, identifiers, params, data, None, files)
200200
return self._call(method, parts, identifiers, params, None, data, files)
201201

202-
def do_auth(self, method, parts, identifiers, params=None, data=None, content_type=None, files=None):
202+
def do_auth(self, method, parts, identifiers, params=None, data=None, files=None, content_type=None):
203203
""" Cloudflare v4 API"""
204204

205-
data, files = self._add_headers(method, content_type, data, files)
205+
data, files = self._add_headers(method, data, files, content_type)
206206
self._add_auth_headers(method)
207207
# We decide at this point if we are sending json or string data
208208
if isinstance(data, (str,bytes,bytearray)):
209209
return self._call(method, parts, identifiers, params, data, None, files)
210210
return self._call(method, parts, identifiers, params, None, data, files)
211211

212-
def do_auth_unwrapped(self, method, parts, identifiers, params=None, data=None, content_type=None, files=None):
212+
def do_auth_unwrapped(self, method, parts, identifiers, params=None, data=None, files=None, content_type=None):
213213
""" Cloudflare v4 API"""
214214

215-
data, files = self._add_headers(method, content_type, data, files)
215+
data, files = self._add_headers(method, data, files, content_type)
216216
self._add_auth_headers(method)
217217
# We decide at this point if we are sending json or string data
218218
if isinstance(data, (str,bytes,bytearray)):
219219
return self._call_unwrapped(method, parts, identifiers, params, data, None, files)
220220
return self._call_unwrapped(method, parts, identifiers, params, None, data, files)
221221

222-
def do_certauth(self, method, parts, identifiers, params=None, data=None, content_type=None, files=None):
222+
def do_certauth(self, method, parts, identifiers, params=None, data=None, files=None, content_type=None):
223223
""" Cloudflare v4 API"""
224224

225-
data, files = self._add_headers(method, content_type, data, files)
225+
data, files = self._add_headers(method, data, files, content_type)
226226
self._add_certtoken_headers(method)
227227
# We decide at this point if we are sending json or string data
228228
if isinstance(data, (str,bytes,bytearray)):
@@ -677,7 +677,8 @@ def __init__(self, base, parts, content_type=None):
677677

678678
self._base = base
679679
self._parts = parts
680-
self._content_type = content_type
680+
if content_type:
681+
self._content_type = content_type
681682
self._do = self._base.do_not_available
682683

683684
def __call__(self, identifier1=None, identifier2=None, identifier3=None, identifier4=None, params=None, data=None):
@@ -699,27 +700,37 @@ def __repr__(self):
699700
def get(self, identifier1=None, identifier2=None, identifier3=None, identifier4=None, params=None, data=None):
700701
""" Cloudflare v4 API"""
701702

702-
return self._do('GET', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data, self._content_type)
703+
if getattr(self, '_content_type', False):
704+
return self._do('GET', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data, self._content_type)
705+
return self._do('GET', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data)
703706

704707
def patch(self, identifier1=None, identifier2=None, identifier3=None, identifier4=None, params=None, data=None):
705708
""" Cloudflare v4 API"""
706709

707-
return self._do('PATCH', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data, self._content_type)
710+
if getattr(self, '_content_type', False):
711+
return self._do('PATCH', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data, self._content_type)
712+
return self._do('PATCH', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data)
708713

709714
def post(self, identifier1=None, identifier2=None, identifier3=None, identifier4=None, params=None, data=None, files=None):
710715
""" Cloudflare v4 API"""
711716

712-
return self._do('POST', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data, self._content_type, files)
717+
if getattr(self, '_content_type', False):
718+
return self._do('POST', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data, files, self._content_type)
719+
return self._do('POST', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data, files)
713720

714721
def put(self, identifier1=None, identifier2=None, identifier3=None, identifier4=None, params=None, data=None, files=None):
715722
""" Cloudflare v4 API"""
716723

717-
return self._do('PUT', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data, self._content_type, files)
724+
if getattr(self, '_content_type', False):
725+
return self._do('PUT', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data, files, self._content_type)
726+
return self._do('PUT', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data, files)
718727

719728
def delete(self, identifier1=None, identifier2=None, identifier3=None, identifier4=None, params=None, data=None):
720729
""" Cloudflare v4 API"""
721730

722-
return self._do('DELETE', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data, self._content_type)
731+
if getattr(self, '_content_type', False):
732+
return self._do('DELETE', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data, self._content_type)
733+
return self._do('DELETE', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data)
723734

724735
class _CFbaseUnused(_CFbase):
725736
""" Cloudflare v4 API"""
@@ -743,22 +754,30 @@ def __init__(self, base, parts, content_type):
743754
def patch(self, identifier1=None, identifier2=None, identifier3=None, identifier4=None, params=None, data=None):
744755
""" Cloudflare v4 API"""
745756

746-
return self._base.do_not_available('PATCH', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data, self._content_type)
757+
if getattr(self, '_content_type', False):
758+
return self._base.do_not_available('PATCH', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data, self._content_type)
759+
return self._base.do_not_available('PATCH', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data)
747760

748761
def post(self, identifier1=None, identifier2=None, identifier3=None, identifier4=None, params=None, data=None, files=None):
749762
""" Cloudflare v4 API"""
750763

751-
return self._base.do_not_available('POST', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data, self._content_type, files)
764+
if getattr(self, '_content_type', False):
765+
return self._base.do_not_available('POST', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data, files, self._content_type)
766+
return self._base.do_not_available('POST', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data, files)
752767

753768
def put(self, identifier1=None, identifier2=None, identifier3=None, identifier4=None, params=None, data=None, files=None):
754769
""" Cloudflare v4 API"""
755770

756-
return self._base.do_not_available('PUT', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data, self._content_type)
771+
if getattr(self, '_content_type', False):
772+
return self._base.do_not_available('PUT', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data, self._content_type)
773+
return self._base.do_not_available('PUT', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data)
757774

758775
def delete(self, identifier1=None, identifier2=None, identifier3=None, identifier4=None, params=None, data=None):
759776
""" Cloudflare v4 API"""
760777

761-
return self._base.do_not_available('DELETE', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data, self._content_type)
778+
if getattr(self, '_content_type', False):
779+
return self._base.do_not_available('DELETE', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data, self._content_type)
780+
return self._base.do_not_available('DELETE', self._parts, [identifier1, identifier2, identifier3, identifier4], params, data)
762781

763782
class _CFbaseAuth(_CFbase):
764783
""" Cloudflare v4 API"""

0 commit comments

Comments
 (0)