Skip to content

Commit a334690

Browse files
timotheustimotheus
committed
pylint fixes
1 parent dae2ec7 commit a334690

34 files changed

Lines changed: 330 additions & 216 deletions

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,8 @@ ebaysdk.egg-info/
77
*.pyc
88
.svn
99
.idea
10+
\.DS_Store
11+
\.eggs
12+
\.tox
13+
venv/
14+
venv*

‎ebaysdk/__init__.py‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
from logging import NullHandler
1717
except ImportError:
1818
class NullHandler(logging.Handler):
19+
1920
def emit(self, record):
2021
pass
2122

@@ -31,11 +32,13 @@ def emit(self, record):
3132
if not log.handlers:
3233
log.addHandler(NullHandler())
3334

35+
3436
def get_version():
3537
return __version__
3638

39+
3740
def set_stream_logger(level=logging.DEBUG, format_string=None):
38-
log.handlers=[]
41+
log.handlers = []
3942

4043
if not format_string:
4144
format_string = "%(asctime)s %(name)s [%(levelname)s]:%(message)s"
@@ -47,6 +50,7 @@ def set_stream_logger(level=logging.DEBUG, format_string=None):
4750
fh.setFormatter(formatter)
4851
log.addHandler(fh)
4952

53+
5054
def trading(*args, **kwargs):
5155
raise ImportError(
5256
'SDK import must be changed as follows:\n\n- %s\n+ %s\n\n' % (
@@ -55,6 +59,7 @@ def trading(*args, **kwargs):
5559
)
5660
)
5761

62+
5863
def shopping(*args, **kwargs):
5964
raise ImportError(
6065
'SDK import must be changed as follows:\n\n- %s\n+ %s\n\n' % (
@@ -63,6 +68,7 @@ def shopping(*args, **kwargs):
6368
)
6469
)
6570

71+
6672
def finding(*args, **kwargs):
6773
raise ImportError(
6874
'SDK import must be changed as follows:\n\n- %s\n+ %s\n\n' % (
@@ -71,6 +77,7 @@ def finding(*args, **kwargs):
7177
)
7278
)
7379

80+
7481
def merchandising(*args, **kwargs):
7582
raise ImportError(
7683
'SDK import must be changed as follows:\n\n- %s\n+ %s\n\n' % (
@@ -79,6 +86,7 @@ def merchandising(*args, **kwargs):
7986
)
8087
)
8188

89+
8290
def html(*args, **kwargs):
8391
raise ImportError(
8492
'SDK import must be changed as follows:\n\n- %s\n+ %s\n\n' % (
@@ -87,6 +95,7 @@ def html(*args, **kwargs):
8795
)
8896
)
8997

98+
9099
def parallel(*args, **kwargs):
91100
raise ImportError(
92101
'SDK import must be changed as follows:\n\n- %s\n+ %s\n\n' % (

‎ebaysdk/config.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,30 +68,31 @@ def _populate_yaml_defaults(self):
6868
return self
6969

7070
if self.config_file:
71-
raise ConnectionConfigError('config file %s not found. Set config_file=None for use without YAML config.' % self.config_file)
71+
raise ConnectionConfigError(
72+
'config file %s not found. Set config_file=None for use without YAML config.' % self.config_file)
7273

7374
def file(self):
7475
return self.config_file_used
7576

7677
def get(self, cKey, defaultValue=None):
77-
#log.debug('get: %s=%s' % (cKey, self.values.get(cKey, defaultValue)))
78+
# log.debug('get: %s=%s' % (cKey, self.values.get(cKey, defaultValue)))
7879
return self.values.get(cKey, defaultValue)
7980

8081
def set(self, cKey, defaultValue, force=False):
8182

8283
if force:
83-
#log.debug('set (force): %s=%s' % (cKey, defaultValue))
84+
# log.debug('set (force): %s=%s' % (cKey, defaultValue))
8485
self.values.update({cKey: defaultValue})
8586

8687
elif cKey in self.connection_kwargs and self.connection_kwargs[cKey] is not None:
87-
#log.debug('set: %s=%s' % (cKey, self.connection_kwargs[cKey]))
88+
# log.debug('set: %s=%s' % (cKey, self.connection_kwargs[cKey]))
8889
self.values.update({cKey: self.connection_kwargs[cKey]})
8990

9091
# otherwise, use yaml default and then fall back to
9192
# the default set in the __init__()
9293
else:
93-
if not cKey in self.values:
94-
#log.debug('set: %s=%s' % (cKey, defaultValue))
94+
if cKey not in self.values:
95+
# log.debug('set: %s=%s' % (cKey, defaultValue))
9596
self.values.update({cKey: defaultValue})
9697
else:
9798
pass

‎ebaysdk/connection.py‎

Lines changed: 38 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
True: 'https',
3131
}
3232

33+
3334
class BaseConnection(object):
3435
"""Base Connection Class."""
3536

@@ -69,15 +70,15 @@ def __init__(self, debug=False, method='GET',
6970

7071
self.base_list_nodes = []
7172
self.datetime_nodes = []
72-
73+
7374
self._reset()
7475

7576
def debug_callback(self, debug_type, debug_message):
7677
log.debug('type: ' + str(debug_type) + ' message' + str(debug_message))
7778

7879
def v(self, *args, **kwargs):
7980
return getValue(self.response.dict(), *args, **kwargs)
80-
81+
8182
def getNodeText(self, nodelist):
8283
return getNodeTextUtils(nodelist)
8384

@@ -103,12 +104,13 @@ def _add_prefix(self, nodes, verb):
103104
if verb:
104105
for i, v in enumerate(nodes):
105106
if not nodes[i].startswith(verb.lower()):
106-
nodes[i] = "%sresponse.%s" % (verb.lower(), nodes[i].lower())
107+
nodes[i] = "%sresponse.%s" % (
108+
verb.lower(), nodes[i].lower())
107109

108110
def execute(self, verb, data=None, list_nodes=[], verb_attrs=None, files=None):
109111
"Executes the HTTP request."
110112
log.debug('execute: verb=%s data=%s' % (verb, data))
111-
113+
112114
self._reset()
113115

114116
self._list_nodes += list_nodes
@@ -118,44 +120,44 @@ def execute(self, verb, data=None, list_nodes=[], verb_attrs=None, files=None):
118120
self._list_nodes += self.base_list_nodes
119121

120122
self.build_request(verb, data, verb_attrs, files)
121-
self.execute_request()
123+
self.execute_request()
122124

123125
if hasattr(self.response, 'content'):
124126
self.process_response()
125127
self.error_check()
126128

127129
log.debug('total time=%s' % (time.time() - self._time))
128130

129-
return self.response
131+
return self.response
130132

131133
def build_request(self, verb, data, verb_attrs, files=None):
132-
134+
133135
self.verb = verb
134136
self._request_dict = data
135137
self._request_id = uuid.uuid4()
136138

137139
url = self.build_request_url(verb)
138140

139141
headers = self.build_request_headers(verb)
140-
headers.update({'User-Agent': UserAgent,
142+
headers.update({'User-Agent': UserAgent,
141143
'X-EBAY-SDK-REQUEST-ID': str(self._request_id)})
142-
144+
143145
# if we are adding files, we ensure there is no Content-Type header already defined
144146
# otherwise Request will use the existing one which is likely not to be multipart/form-data
145147
# data must also be a dict so we make it so if needed
146148

147149
requestData = self.build_request_data(verb, data, verb_attrs)
148150
if files:
149151
del(headers['Content-Type'])
150-
if isinstance(requestData, basestring): # pylint: disable-msg=E0602
151-
requestData = {'XMLPayload':requestData}
152+
if isinstance(requestData, basestring): # pylint: disable-msg=E0602
153+
requestData = {'XMLPayload': requestData}
152154

153155
request = Request(self.method,
154-
url,
155-
data=smart_encode_request_data(requestData),
156-
headers=headers,
157-
files=files,
158-
)
156+
url,
157+
data=smart_encode_request_data(requestData),
158+
headers=headers,
159+
files=files,
160+
)
159161

160162
self.request = request.prepare()
161163

@@ -175,8 +177,8 @@ def build_request_url(self, verb):
175177

176178
def execute_request(self):
177179

178-
log.debug("REQUEST (%s): %s %s" \
179-
% (self._request_id, self.request.method, self.request.url))
180+
log.debug("REQUEST (%s): %s %s"
181+
% (self._request_id, self.request.method, self.request.url))
180182
log.debug('headers=%s' % self.request.headers)
181183
log.debug('body=%s' % self.request.body)
182184

@@ -185,18 +187,18 @@ def execute_request(self):
185187
return None
186188

187189
self.response = self.session.send(self.request,
188-
verify=True,
189-
proxies=self.proxies,
190-
timeout=self.timeout,
191-
allow_redirects=True
192-
)
190+
verify=True,
191+
proxies=self.proxies,
192+
timeout=self.timeout,
193+
allow_redirects=True
194+
)
193195

194196
log.debug('RESPONSE (%s):' % self._request_id)
195197
log.debug('elapsed time=%s' % self.response.elapsed)
196198
log.debug('status code=%s' % self.response.status_code)
197199
log.debug('headers=%s' % self.response.headers)
198-
log.debug('content=%s' % self.response.text)
199-
200+
log.debug('content=%s' % self.response.text)
201+
200202
def process_response(self, parse_response=True):
201203
"""Post processing of the response"""
202204

@@ -208,7 +210,7 @@ def process_response(self, parse_response=True):
208210

209211
# set for backward compatibility
210212
self._response_content = self.response.content
211-
213+
212214
if self.response.status_code != 200:
213215
self._response_error = self.response.reason
214216

@@ -243,7 +245,8 @@ def response_soup(self):
243245
from bs4 import BeautifulStoneSoup
244246
except ImportError:
245247
from BeautifulSoup import BeautifulStoneSoup
246-
log.warn('DeprecationWarning: BeautifulSoup 3 or earlier is deprecated; install bs4 instead\n')
248+
log.warn(
249+
'DeprecationWarning: BeautifulSoup 3 or earlier is deprecated; install bs4 instead\n')
247250

248251
self._response_soup = BeautifulStoneSoup(
249252
smart_decode(self.response_content)
@@ -270,22 +273,25 @@ def response_dom(self):
270273
regex = re.compile(b'xmlns="[^"]+"')
271274
content = regex.sub(b'', self.response.content)
272275
else:
273-
content = "<%sResponse></%sResponse>" % (self.verb, self.verb)
276+
content = "<%sResponse></%sResponse>" % (
277+
self.verb, self.verb)
274278

275279
dom = parseString(content)
276280
self._response_dom = dom.getElementsByTagName(
277281
self.verb + 'Response')[0]
278282

279283
except ExpatError as e:
280-
raise ConnectionResponseError("Invalid Verb: %s (%s)" % (self.verb, e), self.response)
284+
raise ConnectionResponseError(
285+
"Invalid Verb: %s (%s)" % (self.verb, e), self.response)
281286
except IndexError:
282287
self._response_dom = dom
283288

284289
return self._response_dom
285290

286291
def response_dict(self):
287292
"Returns the response dictionary."
288-
log.warn('response_dict() DEPRECATED, use response.dict() or response.reply instead')
293+
log.warn(
294+
'response_dict() DEPRECATED, use response.dict() or response.reply instead')
289295

290296
return self.response.reply
291297

@@ -330,12 +336,12 @@ def error(self):
330336
if len(error_array) > 0:
331337
# Force all errors to be unicode in a proper way
332338
error_array = [smart_decode(smart_encode(e)) for e in error_array]
333-
error_string = u"{verb}: {message}".format(verb=self.verb, message=u", ".join(error_array))
339+
error_string = u"{verb}: {message}".format(
340+
verb=self.verb, message=u", ".join(error_array))
334341

335342
return error_string
336343

337344
return None
338345

339346
def opendoc(self):
340347
webbrowser.open(self.config.get('doc_url'))
341-

‎ebaysdk/exception.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
Licensed under CDDL 1.0
77
'''
88

9+
910
class EbaySDKError(Exception):
11+
1012
def __init__(self, msg, response=None):
1113
super(EbaySDKError, self).__init__(u'%s' % msg)
1214
self.message = u'%s' % msg
@@ -15,17 +17,22 @@ def __init__(self, msg, response=None):
1517
def __str__(self):
1618
return repr(self.message)
1719

20+
1821
class ConnectionError(EbaySDKError):
1922
pass
2023

24+
2125
class ConnectionConfigError(EbaySDKError):
2226
pass
2327

28+
2429
class ConnectionResponseError(EbaySDKError):
2530
pass
2631

32+
2733
class RequestPaginationError(EbaySDKError):
2834
pass
2935

36+
3037
class PaginationLimit(EbaySDKError):
3138
pass

0 commit comments

Comments
 (0)