Update to uap-core and fix os_v1_replacement (ua-parser#59)

ondras · mattrobenolt · commit 14bf01bf84b1 · 2018-04-09T08:09:18.000-07:00
* updated to latest uap-core

* fixes broken test for os_v1_replacement

* fixing utf8
diff --git a/setup.py b/setup.py
@@ -82,13 +82,14 @@ def force_bytes(text):
         with open(yaml_src, 'rb') as fp:
             regexes = yaml.safe_load(fp)
         with open(py_dest, 'wb') as fp:
+            fp.write(b'# -*- coding: utf-8 -*-\n')
             fp.write(b'############################################\n')
             fp.write(b'# NOTICE: This file is autogenerated from  #\n')
             fp.write(b'# regexes.yaml. Do not edit by hand,       #\n')
             fp.write(b'# instead, re-run `setup.py build_regexes` #\n')
             fp.write(b'############################################\n')
             fp.write(b'\n')
-            fp.write(b'from __future__ import absolute_import\n')
+            fp.write(b'from __future__ import absolute_import, unicode_literals\n')
             fp.write(b'from .user_agent_parser import (\n')
             fp.write(b'    UserAgentParser, DeviceParser, OSParser,\n')
             fp.write(b')\n')
diff --git a/ua_parser/user_agent_parser.py b/ua_parser/user_agent_parser.py
@@ -117,7 +117,10 @@ def Parse(self, user_agent_string):
                 os = match.group(1)
 
             if self.os_v1_replacement:
-                os_v1 = self.os_v1_replacement
+                if re.search(r'\$1', self.os_v1_replacement):
+                    os_v1 = re.sub(r'\$1', match.group(1), self.os_v1_replacement)
+                else:
+                    os_v1 = self.os_v1_replacement
             elif match.lastindex and match.lastindex >= 2:
                 os_v1 = match.group(2)
 
diff --git a/uap-core b/uap-core
@@ -1 +1 @@
-Subproject commit ce89c7637eeeb07b3464dbf40645bb3973723c0a
+Subproject commit fc570f378e41063bad3bdf0532967743efc75b4b
