Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 93a51a3

Browse files
mattrobenoltmattrobenolt
committed
Fixed various lint issues
1 parent 2ff6a4c commit 93a51a3

File tree

3 files changed

+83
-74
lines changed

3 files changed

+83
-74
lines changed

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def install_regexes():
1111
yaml_src = os.path.join(cwd, 'uap-core', 'regexes.yaml')
1212
if not os.path.exists(yaml_src):
1313
raise RuntimeError(
14-
'Unable to find regexes.yaml, should be at %r' % yaml_src)
14+
'Unable to find regexes.yaml, should be at %r' % yaml_src)
1515

1616
print('Converting regexes.yaml to regexes.json...')
1717
import json

‎ua_parser/user_agent_parser.py

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@ def __init__(self, pattern, regex_flag=None, device_replacement=None, brand_repl
158158
"""
159159
self.pattern = pattern
160160
if regex_flag == 'i':
161-
self.user_agent_re = re.compile(self.pattern, re.IGNORECASE)
161+
self.user_agent_re = re.compile(self.pattern, re.IGNORECASE)
162162
else:
163-
self.user_agent_re = re.compile(self.pattern)
163+
self.user_agent_re = re.compile(self.pattern)
164164
self.device_replacement = device_replacement
165165
self.brand_replacement = brand_replacement
166166
self.model_replacement = model_replacement
@@ -175,11 +175,11 @@ def MatchSpans(self, user_agent_string):
175175

176176
def MultiReplace(self, string, match):
177177
def _repl(m):
178-
index = int(m.group(1)) - 1
179-
group = match.groups()
180-
if index < len(group):
181-
return group[index]
182-
return ''
178+
index = int(m.group(1)) - 1
179+
group = match.groups()
180+
if index < len(group):
181+
return group[index]
182+
return ''
183183

184184
_string = re.sub(r'\$(\d)', _repl, string)
185185
_string = re.sub(r'^\s+|\s+$', '', _string)
@@ -261,8 +261,10 @@ def ParseUserAgent(user_agent_string, **jsParseBits):
261261
# Override for Chrome Frame IFF Chrome is enabled.
262262
if 'js_user_agent_string' in jsParseBits:
263263
js_user_agent_string = jsParseBits['js_user_agent_string']
264-
if (js_user_agent_string and js_user_agent_string.find('Chrome/') > -1 and
265-
user_agent_string.find('chromeframe') > -1):
264+
if (
265+
js_user_agent_string and js_user_agent_string.find('Chrome/') > -1 and
266+
user_agent_string.find('chromeframe') > -1
267+
):
266268
jsOverride = {}
267269
jsOverride = ParseUserAgent(js_user_agent_string)
268270
family = 'Chrome Frame (%s %s)' % (family, v1)
@@ -314,7 +316,7 @@ def ParseDevice(user_agent_string):
314316
if device:
315317
break
316318

317-
if device == None:
319+
if device is None:
318320
device = 'Other'
319321

320322
return {
@@ -381,8 +383,10 @@ def ParseWithJSOverrides(user_agent_string,
381383
break
382384

383385
# Override for Chrome Frame IFF Chrome is enabled.
384-
if (js_user_agent_string and js_user_agent_string.find('Chrome/') > -1 and
385-
user_agent_string.find('chromeframe') > -1):
386+
if (
387+
js_user_agent_string and js_user_agent_string.find('Chrome/') > -1 and
388+
user_agent_string.find('chromeframe') > -1
389+
):
386390
family = 'Chrome Frame (%s %s)' % (family, v1)
387391
ua_dict = ParseUserAgent(js_user_agent_string)
388392
v1 = ua_dict['major']
@@ -438,11 +442,11 @@ def GetFilters(user_agent_string, js_user_agent_string=None,
438442
"""
439443
filters = {}
440444
filterdict = {
441-
'js_user_agent_string': js_user_agent_string,
442-
'js_user_agent_family': js_user_agent_family,
443-
'js_user_agent_v1': js_user_agent_v1,
444-
'js_user_agent_v2': js_user_agent_v2,
445-
'js_user_agent_v3': js_user_agent_v3
445+
'js_user_agent_string': js_user_agent_string,
446+
'js_user_agent_family': js_user_agent_family,
447+
'js_user_agent_v1': js_user_agent_v1,
448+
'js_user_agent_v2': js_user_agent_v2,
449+
'js_user_agent_v3': js_user_agent_v3
446450
}
447451
for key, value in filterdict.items():
448452
if value is not None and value != '':

‎ua_parser/user_agent_parser_test.py

Lines changed: 61 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -72,31 +72,31 @@ def testPGTSStrings(self):
7272
def testParseAll(self):
7373
user_agent_string = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.4; fr; rv:1.9.1.5) Gecko/20091102 Firefox/3.5.5,gzip(gfe),gzip(gfe)'
7474
expected = {
75-
'device': {
76-
'family': 'Other',
77-
'brand': None,
78-
'model': None
79-
},
80-
'os': {
81-
'family': 'Mac OS X',
82-
'major': '10',
83-
'minor': '4',
84-
'patch': None,
85-
'patch_minor': None
86-
},
87-
'user_agent': {
88-
'family': 'Firefox',
89-
'major': '3',
90-
'minor': '5',
91-
'patch': '5'
92-
},
93-
'string': user_agent_string
75+
'device': {
76+
'family': 'Other',
77+
'brand': None,
78+
'model': None
79+
},
80+
'os': {
81+
'family': 'Mac OS X',
82+
'major': '10',
83+
'minor': '4',
84+
'patch': None,
85+
'patch_minor': None
86+
},
87+
'user_agent': {
88+
'family': 'Firefox',
89+
'major': '3',
90+
'minor': '5',
91+
'patch': '5'
92+
},
93+
'string': user_agent_string
9494
}
9595

9696
result = user_agent_parser.Parse(user_agent_string)
97-
self.assertEqual(result, expected,
97+
self.assertEqual(
98+
result, expected,
9899
"UA: {0}\n expected<{1}> != actual<{2}>".format(user_agent_string, expected, result))
99-
100100
# Make a YAML file for manual comparsion with pgts_browser_list-orig.yaml
101101
def makePGTSComparisonYAML(self):
102102
import codecs
@@ -146,11 +146,12 @@ def runUserAgentTestsFromYAML(self, file_name):
146146

147147
result = {}
148148
result = user_agent_parser.ParseUserAgent(user_agent_string, **kwds)
149-
self.assertEqual(result, expected,
150-
"UA: {0}\n expected<{1}, {2}, {3}, {4}> != actual<{5}, {6}, {7}, {8}>".format(\
151-
user_agent_string,
152-
expected['family'], expected['major'], expected['minor'], expected['patch'],
153-
result['family'], result['major'], result['minor'], result['patch']))
149+
self.assertEqual(
150+
result, expected,
151+
"UA: {0}\n expected<{1}, {2}, {3}, {4}> != actual<{5}, {6}, {7}, {8}>".format(
152+
user_agent_string,
153+
expected['family'], expected['major'], expected['minor'], expected['patch'],
154+
result['family'], result['major'], result['minor'], result['patch']))
154155

155156
def runOSTestsFromYAML(self, file_name):
156157
yamlFile = open(os.path.join(TEST_RESOURCES_DIR, file_name))
@@ -166,27 +167,28 @@ def runOSTestsFromYAML(self, file_name):
166167

167168
# The expected results
168169
expected = {
169-
'family': test_case['family'],
170-
'major': test_case['major'],
171-
'minor': test_case['minor'],
172-
'patch': test_case['patch'],
173-
'patch_minor': test_case['patch_minor']
170+
'family': test_case['family'],
171+
'major': test_case['major'],
172+
'minor': test_case['minor'],
173+
'patch': test_case['patch'],
174+
'patch_minor': test_case['patch_minor']
174175
}
175176

176177
result = user_agent_parser.ParseOS(user_agent_string, **kwds)
177-
self.assertEqual(result, expected,
178-
"UA: {0}\n expected<{1} {2} {3} {4} {5}> != actual<{6} {7} {8} {9} {10}>".format(\
179-
user_agent_string,
180-
expected['family'],
181-
expected['major'],
182-
expected['minor'],
183-
expected['patch'],
184-
expected['patch_minor'],
185-
result['family'],
186-
result['major'],
187-
result['minor'],
188-
result['patch'],
189-
result['patch_minor']))
178+
self.assertEqual(
179+
result, expected,
180+
"UA: {0}\n expected<{1} {2} {3} {4} {5}> != actual<{6} {7} {8} {9} {10}>".format(
181+
user_agent_string,
182+
expected['family'],
183+
expected['major'],
184+
expected['minor'],
185+
expected['patch'],
186+
expected['patch_minor'],
187+
result['family'],
188+
result['major'],
189+
result['minor'],
190+
result['patch'],
191+
result['patch_minor']))
190192

191193
def runDeviceTestsFromYAML(self, file_name):
192194
yamlFile = open(os.path.join(TEST_RESOURCES_DIR, file_name))
@@ -202,13 +204,14 @@ def runDeviceTestsFromYAML(self, file_name):
202204

203205
# The expected results
204206
expected = {
205-
'family': test_case['family'],
206-
'brand': test_case['brand'],
207-
'model': test_case['model']
207+
'family': test_case['family'],
208+
'brand': test_case['brand'],
209+
'model': test_case['model']
208210
}
209211

210212
result = user_agent_parser.ParseDevice(user_agent_string, **kwds)
211-
self.assertEqual(result, expected,
213+
self.assertEqual(
214+
result, expected,
212215
"UA: {0}\n expected<{1} {2} {3}> != actual<{4} {5} {6}>".format(
213216
user_agent_string,
214217
expected['family'],
@@ -223,23 +226,25 @@ class GetFiltersTest(unittest.TestCase):
223226
def testGetFiltersNoMatchesGiveEmptyDict(self):
224227
user_agent_string = 'foo'
225228
filters = user_agent_parser.GetFilters(
226-
user_agent_string, js_user_agent_string=None)
229+
user_agent_string, js_user_agent_string=None)
227230
self.assertEqual({}, filters)
228231

229232
def testGetFiltersJsUaPassedThrough(self):
230233
user_agent_string = 'foo'
231234
filters = user_agent_parser.GetFilters(
232-
user_agent_string, js_user_agent_string='bar')
235+
user_agent_string, js_user_agent_string='bar')
233236
self.assertEqual({'js_user_agent_string': 'bar'}, filters)
234237

235238
def testGetFiltersJsUserAgentFamilyAndVersions(self):
236-
user_agent_string = ('Mozilla/4.0 (compatible; MSIE 8.0; '
237-
'Windows NT 5.1; Trident/4.0; GTB6; .NET CLR 2.0.50727; '
238-
'.NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)')
239+
user_agent_string = (
240+
'Mozilla/4.0 (compatible; MSIE 8.0; '
241+
'Windows NT 5.1; Trident/4.0; GTB6; .NET CLR 2.0.50727; '
242+
'.NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)')
239243
filters = user_agent_parser.GetFilters(
240-
user_agent_string, js_user_agent_string='bar',
241-
js_user_agent_family='foo')
242-
self.assertEqual({'js_user_agent_string': 'bar',
244+
user_agent_string, js_user_agent_string='bar',
245+
js_user_agent_family='foo')
246+
self.assertEqual({
247+
'js_user_agent_string': 'bar',
243248
'js_user_agent_family': 'foo'}, filters)
244249

245250

0 commit comments

Comments
 (0)