For #35260: Refactoring scoping of sgtimezone so that dates are picklable and convertable

Author: Neil Grey

shotgun_api3/lib/sgtimezone.py

@@ -5,10 +5,11 @@
 #  current users of api2 to install new modules and modify PYTHONPATH info.
 # ----------------------------------------------------------------------------
 
-class SgTimezone(object):
-    from datetime import tzinfo, timedelta, datetime
-    import time as _time
+from datetime import tzinfo, timedelta, datetime
+import time as _time
 
+class SgTimezone(object):
+    
     ZERO = timedelta(0)
     STDOFFSET = timedelta(seconds = -_time.timezone)
     if _time.daylight:
@@ -18,41 +19,40 @@ class SgTimezone(object):
     DSTDIFF = DSTOFFSET - STDOFFSET
 
     def __init__(self): 
-        self.utc = self.UTC()
-        self.local = self.LocalTimezone()
+        self.utc = UTC()
+        self.local = LocalTimezone()
 
-    class UTC(tzinfo):
-        
-        def utcoffset(self, dt):
-            return SgTimezone.ZERO
-        
-        def tzname(self, dt):
-            return "UTC"
-        
-        def dst(self, dt):
-            return SgTimezone.ZERO
+class UTC(tzinfo):
+    
+    def utcoffset(self, dt):
+        return SgTimezone.ZERO
 
-    class LocalTimezone(tzinfo):
-        
-        def utcoffset(self, dt):
-            if self._isdst(dt):
-                return SgTimezone.DSTOFFSET
-            else:
-                return SgTimezone.STDOFFSET
-        
-        def dst(self, dt):
-            if self._isdst(dt):
-                return SgTimezone.DSTDIFF
-            else:
-                return SgTimezone.ZERO
-        
-        def tzname(self, dt):
-            return _time.tzname[self._isdst(dt)]
-        
-        def _isdst(self, dt):
-            tt = (dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second, dt.weekday(), 0, -1)
-            import time as _time
-            stamp = _time.mktime(tt)
-            tt = _time.localtime(stamp)
-            return tt.tm_isdst > 0
+    def tzname(self, dt):
+        return "UTC"
+    
+    def dst(self, dt):
+        return SgTimezone.ZERO
 
+class LocalTimezone(tzinfo):
+    
+    def utcoffset(self, dt):
+        if self._isdst(dt):
+            return SgTimezone.DSTOFFSET
+        else:
+            return SgTimezone.STDOFFSET
+    
+    def dst(self, dt):
+        if self._isdst(dt):
+            return SgTimezone.DSTDIFF
+        else:
+            return SgTimezone.ZERO
+    
+    def tzname(self, dt):
+        return _time.tzname[self._isdst(dt)]
+    
+    def _isdst(self, dt):
+        tt = (dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second, dt.weekday(), 0, -1)
+        import time as _time
+        stamp = _time.mktime(tt)
+        tt = _time.localtime(stamp)
+        return tt.tm_isdst > 0