Merge pull request #25 from OneDrive/datetime-fixes

Datetime fixes

Author: cdmayer

src/onedrivesdk/model/item.py

@@ -82,15 +82,13 @@ def created_date_time(self):
                 The createdDateTime
         """
         if "createdDateTime" in self._prop_dict:
-            time_format = "%Y-%m-%dT%H:%M:%S.%f"
-            return datetime.strptime(self._prop_dict["createdDateTime"].replace("Z",""), time_format)
+            return self.get_datetime_from_string(self._prop_dict["createdDateTime"])
         else:
             return None
 
     @created_date_time.setter
     def created_date_time(self, val):
-        time_format = "%Y-%m-%dT%H:%M:%S.%fZ"
-        self._prop_dict["createdDateTime"] = val.strftime(time_format)
+        self._prop_dict["createdDateTime"] = self.get_string_from_datetime(val)
 
     @property
     def c_tag(self):
@@ -196,15 +194,13 @@ def last_modified_date_time(self):
                 The lastModifiedDateTime
         """
         if "lastModifiedDateTime" in self._prop_dict:
-            time_format = "%Y-%m-%dT%H:%M:%S.%f"
-            return datetime.strptime(self._prop_dict["lastModifiedDateTime"].replace("Z",""), time_format)
+            return self.get_datetime_from_string(self._prop_dict["lastModifiedDateTime"])
         else:
             return None
 
     @last_modified_date_time.setter
     def last_modified_date_time(self, val):
-        time_format = "%Y-%m-%dT%H:%M:%S.%fZ"
-        self._prop_dict["lastModifiedDateTime"] = val.strftime(time_format)
+        self._prop_dict["lastModifiedDateTime"] = self.get_string_from_datetime(val)
 
     @property
     def name(self):

src/onedrivesdk/one_drive_object_base.py

@@ -21,10 +21,13 @@
  THE SOFTWARE.
 ------------------------------------------------------------------------------
 '''
-
+from datetime import datetime
 
 class OneDriveObjectBase(object):
 
+    DATETIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%fZ"
+    DATETIME_FORMAT_NO_MILLISECONDS = "%Y-%m-%dT%H:%M:%SZ"
+    
     def to_dict(self):
         """Returns the serialized form of the :class:`OneDriveObjectBase`
         as a dict. All sub-objects that are based off of :class:`OneDriveObjectBase`
@@ -42,3 +45,20 @@ def to_dict(self):
                 serialized[prop] = self._prop_dict[prop]
 
         return serialized
+        
+    @staticmethod
+    def get_datetime_from_string(s):
+        try:
+            dt = datetime.strptime(
+                s,
+                OneDriveObjectBase.DATETIME_FORMAT)
+        except ValueError as ve:
+            # Try again with other format
+            dt = datetime.strptime(
+                s,
+                OneDriveObjectBase.DATETIME_FORMAT_NO_MILLISECONDS)
+        return dt
+        
+    @staticmethod
+    def get_string_from_datetime(dt):
+        return dt.strftime(OneDriveObjectBase.DATETIME_FORMAT)