xmlpydict 0.0.8__tar.gz → 0.0.9__tar.gz

{xmlpydict-0.0.8/src/xmlpydict.egg-info → xmlpydict-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xmlpydict
-Version: 0.0.8
+Version: 0.0.9
 Summary: xml to dictionary tool for python
 Author-email: Matthew Taylor <matthew.taylor.andre@gmail.com>
 Project-URL: Homepage, https://github.com/MatthewAndreTaylor/xml-to-pydict
@@ -54,13 +54,12 @@ pip install xmlpydict
 
 ## Goals
 
-Create a consistent parsing strategy between xml and python dictionaries.
-xmlpydict takes a more laid pack approack to enforcing the syntax of xml.
+Create a consistent parsing strategy between XML and Python dictionaries. xmlpydict takes a more laid-back approach to enforce the syntax of XML. However, still ensures fast speeds by using finite automata.
 
 ## Features
 
 xmlpydict allows for multiple root elements.
-The root object is treated as the python object.
+The root object is treated as the Python object.
 
 ### xmlpydict supports the following 
 

{xmlpydict-0.0.8 → xmlpydict-0.0.9}/README.md

@@ -28,13 +28,12 @@ pip install xmlpydict
 
 ## Goals
 
-Create a consistent parsing strategy between xml and python dictionaries.
-xmlpydict takes a more laid pack approack to enforcing the syntax of xml.
+Create a consistent parsing strategy between XML and Python dictionaries. xmlpydict takes a more laid-back approach to enforce the syntax of XML. However, still ensures fast speeds by using finite automata.
 
 ## Features
 
 xmlpydict allows for multiple root elements.
-The root object is treated as the python object.
+The root object is treated as the Python object.
 
 ### xmlpydict supports the following 
 

{xmlpydict-0.0.8 → xmlpydict-0.0.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "xmlpydict"
-version = "0.0.8"
+version = "0.0.9"
 description="xml to dictionary tool for python"
 authors = [
     {name = "Matthew Taylor", email = "matthew.taylor.andre@gmail.com"},

{xmlpydict-0.0.8 → xmlpydict-0.0.9}/src/xmlparse.cpp

@@ -273,9 +273,28 @@ static void parseText(XMLNode *node, const char *xmlContent) {
   }
 }
 
+static void parseProlog(const char *xmlContent) {
+  const char* startTag = "<?xml";
+  int j = 0;
+  for (j = 0; j < 5 && xmlContent[j] != '\0'; j++) {
+      if (xmlContent[j] != startTag[j]) {
+          return;
+      }
+  }
+  i = j;
+  while (xmlContent[i] != '\0') {
+    if (xmlContent[i] == '>'){
+      i++;
+      break;
+    }
+    i++;
+  }
+}
+
 static std::vector<XMLNode> splitNodes(const char *xmlContent) {
   std::vector<XMLNode> nodes;
   i = 0;
+  parseProlog(xmlContent);
 
   while (xmlContent[i] != '\0') {
     XMLNode node;

{xmlpydict-0.0.8 → xmlpydict-0.0.9}/src/xmlparse.py

@@ -1,6 +1,6 @@
-def parse(xml_content: str) -> dict:
+def parse(xml_content: str, attr_prefix="@") -> dict:
     i = 0
-    key = "@"
+    key = attr_prefix
     val = ""
     xml_content += " "
 
@@ -35,7 +35,7 @@ def parse(xml_content: str) -> dict:
                                 in_quotes = not in_quotes
                                 if not in_quotes and key != "" and val != "":
                                     d[key] = val
-                                    key = "@"
+                                    key = attr_prefix
                                     val = ""
                             elif in_quotes:
                                 val += xml_content[i]
@@ -63,6 +63,6 @@ def parse(xml_content: str) -> dict:
             element_name = xml_content[i:j].strip()
             i = j
             if len(element_name) > 0:
-                curr_dict["#text"] = element_name
+                curr_dict["#text"] = curr_dict.setdefault("#text", "") + element_name
 
     return container_stack.pop()

{xmlpydict-0.0.8 → xmlpydict-0.0.9/src/xmlpydict.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xmlpydict
-Version: 0.0.8
+Version: 0.0.9
 Summary: xml to dictionary tool for python
 Author-email: Matthew Taylor <matthew.taylor.andre@gmail.com>
 Project-URL: Homepage, https://github.com/MatthewAndreTaylor/xml-to-pydict
@@ -54,13 +54,12 @@ pip install xmlpydict
 
 ## Goals
 
-Create a consistent parsing strategy between xml and python dictionaries.
-xmlpydict takes a more laid pack approack to enforcing the syntax of xml.
+Create a consistent parsing strategy between XML and Python dictionaries. xmlpydict takes a more laid-back approach to enforce the syntax of XML. However, still ensures fast speeds by using finite automata.
 
 ## Features
 
 xmlpydict allows for multiple root elements.
-The root object is treated as the python object.
+The root object is treated as the Python object.
 
 ### xmlpydict supports the following