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

Skip to content

Commit 14bf01b

Browse files
ondrasmattrobenolt
authored andcommitted
Update to uap-core and fix os_v1_replacement (ua-parser#59)
* updated to latest uap-core * fixes broken test for os_v1_replacement * fixing utf8
1 parent 6247d69 commit 14bf01b

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,14 @@ def force_bytes(text):
8282
with open(yaml_src, 'rb') as fp:
8383
regexes = yaml.safe_load(fp)
8484
with open(py_dest, 'wb') as fp:
85+
fp.write(b'# -*- coding: utf-8 -*-\n')
8586
fp.write(b'############################################\n')
8687
fp.write(b'# NOTICE: This file is autogenerated from #\n')
8788
fp.write(b'# regexes.yaml. Do not edit by hand, #\n')
8889
fp.write(b'# instead, re-run `setup.py build_regexes` #\n')
8990
fp.write(b'############################################\n')
9091
fp.write(b'\n')
91-
fp.write(b'from __future__ import absolute_import\n')
92+
fp.write(b'from __future__ import absolute_import, unicode_literals\n')
9293
fp.write(b'from .user_agent_parser import (\n')
9394
fp.write(b' UserAgentParser, DeviceParser, OSParser,\n')
9495
fp.write(b')\n')

ua_parser/user_agent_parser.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,10 @@ def Parse(self, user_agent_string):
117117
os = match.group(1)
118118

119119
if self.os_v1_replacement:
120-
os_v1 = self.os_v1_replacement
120+
if re.search(r'\$1', self.os_v1_replacement):
121+
os_v1 = re.sub(r'\$1', match.group(1), self.os_v1_replacement)
122+
else:
123+
os_v1 = self.os_v1_replacement
121124
elif match.lastindex and match.lastindex >= 2:
122125
os_v1 = match.group(2)
123126

0 commit comments

Comments
 (0)