dotstrings 3.0.0__tar.gz → 3.1.0__tar.gz

{dotstrings-3.0.0 → dotstrings-3.1.0}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: dotstrings
-Version: 3.0.0
+Version: 3.1.0
 Summary: Tools for dealing with the .strings files for iOS and macOS
 Home-page: https://github.com/Microsoft/dotstrings
 License: MIT
 Keywords: localization,iOS,macOS,strings
 Author: Dale Myers
-Author-email: dalemy@microsoft.com
+Author-email: dalemyers@microsoft.com
 Requires-Python: >=3.10,<4.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
@@ -17,6 +17,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Topic :: Software Development

{dotstrings-3.0.0 → dotstrings-3.1.0}/dotstrings/parser.py

@@ -15,6 +15,7 @@ class Patterns:
     comment = re.compile(r"(\'(?:[^\'\\]|\\[\s\S])*\')|//.*|/\*(?:[^*]|\*(?!/))*\*/", re.MULTILINE)
     whitespace = re.compile(r"\s*", re.MULTILINE)
     entry = re.compile(r'"(.*)"\s*=\s*"(.*)";')
+    quoteless_key_entry = re.compile(r'(.*?)\s*=\s*"(.*)";')
 
 
 class Scanner:
@@ -137,18 +138,32 @@ def loads(contents: str) -> list[DotStringsEntry]:
             # Pull out any whitespace
             _ = scanner.scan(Patterns.whitespace)
 
-        # Get the entry line
+        # Get the entry line. Always try with quotes first to avoid matching
+        # the "quoteless" style and then including the quotes in the key.
         entry = scanner.scan(Patterns.entry)
+        regular_entry = True
 
         if entry is None:
-            if scanner.has_more():
-                raise DotStringsException(f"Expected an entry at offset {scanner.offset}")
-            break
+            entry = scanner.scan(Patterns.quoteless_key_entry)
+            regular_entry = False
+
+            if entry is None:
+                if scanner.has_more():
+                    raise DotStringsException(
+                        f"Expected an entry at offset {scanner.offset}"
+                    )
+                break
 
         # Now extract the key and value
-        entry_matches = Patterns.entry.search(entry)
+        if regular_entry:
+            entry_matches = Patterns.entry.search(entry)
+        else:
+            entry_matches = Patterns.quoteless_key_entry.search(entry)
+
         if not entry_matches:
-            raise DotStringsException(f"Failed to parse entry at offset {scanner.offset}")
+            raise DotStringsException(
+                f"Failed to parse entry at offset {scanner.offset}"
+            )
 
         key = entry_matches.group(1)
         value = entry_matches.group(2)

{dotstrings-3.0.0 → dotstrings-3.1.0}/pyproject.toml

@@ -1,12 +1,12 @@
 [tool.poetry]
 name = "dotstrings"
-version = "3.0.0"
+version = "3.1.0"
 description = "Tools for dealing with the .strings files for iOS and macOS"
 
 license = "MIT"
 
 authors = [
-    "Dale Myers <dalemy@microsoft.com>"
+    "Dale Myers <dalemyers@microsoft.com>"
 ]
 
 readme = 'README.md'