polyxml 0.2.0__tar.gz → 0.2.1__tar.gz

{polyxml-0.2.0 → polyxml-0.2.1}/Cargo.lock

@@ -396,7 +396,7 @@ checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
 
 [[package]]
 name = "polyxml"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "criterion",
  "lexical-core",
@@ -409,14 +409,14 @@ dependencies = [
 
 [[package]]
 name = "polyxml-c"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "polyxml",
 ]
 
 [[package]]
 name = "polyxml-js"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "napi",
  "napi-build",
@@ -426,7 +426,7 @@ dependencies = [
 
 [[package]]
 name = "polyxml-python"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "lexical-core",
  "polyxml",

{polyxml-0.2.0 → polyxml-0.2.1}/Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/polyxml-core", "crates/polyxml-python"]
 
 [workspace.package]
-version = "0.2.0"
+version = "0.2.1"
 edition = "2021"
 rust-version = "1.80"
 license = "MIT"

{polyxml-0.2.0 → polyxml-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyxml
-Version: 0.2.0
+Version: 0.2.1
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License

{polyxml-0.2.0 → polyxml-0.2.1}/crates/polyxml-python/src/lib.rs

@@ -372,48 +372,28 @@ fn convert_scalar_to_py<'py>(
                         let dec = decimal_cls.call1((s.as_str(),))?;
                         return Ok(dec.unbind());
                     }
-                    "XmlDate" => {
-                        if let Ok(datatype_mod) = py.import_bound("pyxsdata.models.datatype") {
-                            if let Ok(cls) = datatype_mod.getattr("XmlDate") {
-                                if let Ok(val) = cls.call_method1("from_string", (s.as_str(),)) {
-                                    return Ok(val.unbind());
-                                }
-                            }
+                    "XmlDate" | "XmlDateTime" | "XmlTime" => {
+                        if let Ok(val) = target_type.call_method1("from_string", (s.as_str(),)) {
+                            return Ok(val.unbind());
                         }
-                        if let Ok(datetime_mod) = py.import_bound("datetime") {
-                            if let Ok(cls) = datetime_mod.getattr("date") {
-                                if let Ok(val) = cls.call_method1("fromisoformat", (s.as_str(),)) {
-                                    return Ok(val.unbind());
-                                }
-                            }
-                        }
-                    }
-                    "XmlDateTime" => {
                         if let Ok(datatype_mod) = py.import_bound("pyxsdata.models.datatype") {
-                            if let Ok(cls) = datatype_mod.getattr("XmlDateTime") {
+                            if let Ok(cls) = datatype_mod.getattr(type_name.as_str()) {
                                 if let Ok(val) = cls.call_method1("from_string", (s.as_str(),)) {
                                     return Ok(val.unbind());
                                 }
                             }
                         }
-                        if let Ok(datetime_mod) = py.import_bound("datetime") {
-                            if let Ok(cls) = datetime_mod.getattr("datetime") {
-                                if let Ok(val) = cls.call_method1("fromisoformat", (s.as_str(),)) {
-                                    return Ok(val.unbind());
-                                }
-                            }
-                        }
-                    }
-                    "XmlTime" => {
-                        if let Ok(datatype_mod) = py.import_bound("pyxsdata.models.datatype") {
-                            if let Ok(cls) = datatype_mod.getattr("XmlTime") {
-                                if let Ok(val) = cls.call_method1("from_string", (s.as_str(),)) {
-                                    return Ok(val.unbind());
-                                }
-                            }
+                        if let Ok(val) = target_type.call1((s.as_str(),)) {
+                            return Ok(val.unbind());
                         }
+                        let mod_name = match type_name.as_str() {
+                            "XmlDate" => "date",
+                            "XmlDateTime" => "datetime",
+                            "XmlTime" => "time",
+                            _ => "",
+                        };
                         if let Ok(datetime_mod) = py.import_bound("datetime") {
-                            if let Ok(cls) = datetime_mod.getattr("time") {
+                            if let Ok(cls) = datetime_mod.getattr(mod_name) {
                                 if let Ok(val) = cls.call_method1("fromisoformat", (s.as_str(),)) {
                                     return Ok(val.unbind());
                                 }
@@ -421,6 +401,9 @@ fn convert_scalar_to_py<'py>(
                         }
                     }
                     "XmlDuration" => {
+                        if let Ok(val) = target_type.call1((s.as_str(),)) {
+                            return Ok(val.unbind());
+                        }
                         if let Ok(datatype_mod) = py.import_bound("pyxsdata.models.datatype") {
                             if let Ok(cls) = datatype_mod.getattr("XmlDuration") {
                                 if let Ok(val) = cls.call1((s.as_str(),)) {

{polyxml-0.2.0 → polyxml-0.2.1}/crates/polyxml-python/tests/test_polyxml.py

@@ -6,7 +6,66 @@ from enum import Enum
 
 import pytest
 from pydantic import BaseModel, Field
-from pyxsdata.models.datatype import XmlDate, XmlDateTime, XmlDuration, XmlTime
+
+try:
+    from pyxsdata.models.datatype import XmlDate, XmlDateTime, XmlDuration, XmlTime
+except ImportError:
+
+    class XmlDate:
+
+        def __init__(self, val: str):
+            self.val = val
+
+        @classmethod
+        def from_string(cls, val: str):
+            return cls(val)
+
+        def __eq__(self, other):
+            return isinstance(other, XmlDate) and self.val == other.val
+
+        def __str__(self):
+            return self.val
+
+    class XmlDateTime:
+
+        def __init__(self, val: str):
+            self.val = val
+
+        @classmethod
+        def from_string(cls, val: str):
+            return cls(val)
+
+        def __eq__(self, other):
+            return isinstance(other, XmlDateTime) and self.val == other.val
+
+        def __str__(self):
+            return self.val
+
+    class XmlTime:
+
+        def __init__(self, val: str):
+            self.val = val
+
+        @classmethod
+        def from_string(cls, val: str):
+            return cls(val)
+
+        def __eq__(self, other):
+            return isinstance(other, XmlTime) and self.val == other.val
+
+        def __str__(self):
+            return self.val
+
+    class XmlDuration:
+
+        def __init__(self, val: str):
+            self.val = val
+
+        def __eq__(self, other):
+            return isinstance(other, XmlDuration) and self.val == other.val
+
+        def __str__(self):
+            return self.val
 
 import polyxml
 

{polyxml-0.2.0 → polyxml-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "polyxml"
-version = "0.2.0"
+version = "0.2.1"
 description = "High-performance, polyglot XML data-binding engine built in Rust"
 authors = [
     { name = "Bailey Nguyen", email = "bailey.tan.nguyen@gmail.com" }