Converter mod tweaks

C-SELLERS · C-SELLERS · commit 53375cef9713 · 2021-02-15T13:14:19.000-08:00
diff --git a/src/runtime/converter.cs b/src/runtime/converter.cs
@@ -58,18 +58,18 @@ static Converter()
             timeSpanCtor = Runtime.PyObject_GetAttrString(dateTimeMod, "timedelta");
             if (timeSpanCtor == null) throw new PythonException();
 
-            IntPtr tzInfoMod = PythonEngine.ModuleFromString("custom_tzinfo",
-                "from datetime import timedelta, tzinfo\n" +
-                "class GMT(tzinfo):\n" +
-                "    def __init__(self, hours, minutes):\n" +
-                "        self.hours = hours\n" +
-                "        self.minutes = minutes\n" +
-                "    def utcoffset(self, dt):\n" +
-                "        return timedelta(hours=self.hours, minutes=self.minutes)\n" +
-                "    def tzname(self, dt):\n" +
-                "        return \"GMT {0:00}:{1:00}\".format(self.hours, self.minutes)\n" +
-                "    def dst (self, dt):\n" +
-                "        return timedelta(0)\n").Handle;
+            IntPtr tzInfoMod = PythonEngine.ModuleFromString("custom_tzinfo", @"
+from datetime import timedelta, tzinfo
+class GMT(tzinfo):
+    def __init__(self, hours, minutes):
+        self.hours = hours
+        self.minutes = minutes
+    def utcoffset(self, dt):
+        return timedelta(hours=self.hours, minutes=self.minutes)
+    def tzname(self, dt):
+        return f'GMT {self.hours:00}:{self.minutes:00}'
+    def dst (self, dt):
+        return timedelta(0)").Handle;
 
             tzInfoCtor = Runtime.PyObject_GetAttrString(tzInfoMod, "GMT");
             if (tzInfoCtor == null) throw new PythonException();
@@ -904,7 +904,7 @@ private static bool ToPrimitive(IntPtr value, Type obType, out object result, bo
                         goto type_error;
                     }
                     Runtime.XDecref(op);
-                    result = dt;
+                    result = sdt.EndsWith("+00:00") ? dt.ToUniversalTime() : dt;
                     return true;
                 default:
                     goto type_error;
