Skip to content

Commit e91d377

Browse files
Merge pull request #1 from SlicingDice/feature/fix_errors_codacy
Feature/fix errors codacy
2 parents cf4a8dc + a65fcc9 commit e91d377

File tree

7 files changed

+14
-12
lines changed

7 files changed

+14
-12
lines changed

pyslicer/api.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ def status_code(self):
4545
def headers(self):
4646
return self.__headers
4747

48-
def _organize_keys(self, master_key, custom_key, read_key, write_key):
48+
@staticmethod
49+
def _organize_keys(master_key, custom_key, read_key, write_key):
4950
return {
5051
"master_key": master_key,
5152
"custom_key": custom_key,
@@ -130,7 +131,8 @@ def _handler_request(self, req):
130131
self._set_properties_values(sd_response)
131132
return sd_response.result
132133

133-
def _check_request(self, request):
134+
@staticmethod
135+
def _check_request(request):
134136
"""Check if the request was successful
135137
136138
Keyword arguments:

pyslicer/client.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ def _data_extraction_wrapper(self, url, query):
125125
req_type="post",
126126
key_level=0)
127127

128-
def _wrapper_test(self, test):
128+
@staticmethod
129+
def _wrapper_test(test):
129130
base_url = SlicingDice.BASE_URL
130131
if test:
131132
base_url += "/test"

pyslicer/exceptions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ def __init__(self, *args, **kwargs):
565565

566566
class QueryCountInvalidParameterErrorException(SlicingDiceException):
567567
def __init__(self, *args, **kwargs):
568-
super(QueryLevelLimitException, self).__init__(
568+
super(QueryCountInvalidParameterErrorException, self).__init__(
569569
self, *args, **kwargs)
570570

571571

pyslicer/utils/validators.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ def __init__(self, queries):
138138
def _valid_keys(self):
139139
if "fields" in self.data:
140140
value = self.data["fields"]
141-
if type(value) != list:
141+
if not isinstance(value, list):
142142
raise exceptions.InvalidQueryException(
143143
"The key 'fields' in query has a invalid value.")
144144
else:
@@ -148,7 +148,7 @@ def _valid_keys(self):
148148
"have up to 10 fields.")
149149
if "limit" in self.data:
150150
limit = self.data['limit']
151-
if type(limit) != int:
151+
if not isinstance(limit, int):
152152
raise exceptions.InvalidQueryException(
153153
"The key 'limit' in query has a invalid value.")
154154
if limit > 100:
@@ -178,7 +178,7 @@ def _has_empty_field(self):
178178
if not all(self.data) or not all(self.data.values()):
179179
raise exceptions.InvalidIndexException(
180180
"This index has invalid keys or values.")
181-
for id, value in self.data.iteritems():
181+
for value in self.data.values():
182182
# Value is a dictionary when it is an entity being indexed:
183183
# "my-entity": {"year": 2016}
184184
# It can also be a parameter, such as "auto-create-fields":

tests_and_examples/examples/aggregation.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1664,7 +1664,7 @@
16641664
"result": {
16651665
"boolean-test-field": [
16661666
{
1667-
"value": "false",
1667+
"value": "true",
16681668
"quantity": 50
16691669
}
16701670
]

tests_and_examples/run_query_tests.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,8 @@ def _append_timestamp_to_field_name(self, field):
137137

138138
self.field_translation[old_name] = new_name
139139

140-
def _get_timestamp(self):
140+
@staticmethod
141+
def _get_timestamp():
141142
"""Get integer timestamp in string format.
142143
143144
Return:

tests_and_examples/test_name_generator.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,8 @@ def main():
210210
open('examples/{}.json'.format(query_type)),
211211
object_pairs_hook=collections.OrderedDict)
212212

213-
for i in range(len(tests)):
214-
tests[i]['name'] = generate_name(query_type, tests[i])
215-
216213
for test in tests:
214+
test['name'] = generate_name(query_type, test)
217215
print test['name']
218216

219217
json.dump(tests,

0 commit comments

Comments
 (0)