williamlang
diff --git a/‎.travis.yml
Lines changed: 1 addition & 1 deletion b/‎.travis.yml
Lines changed: 1 addition & 1 deletion
diff --git a/‎tableauserverclient/datetime_helpers.py
Lines changed: 3 additions & 0 deletions b/‎tableauserverclient/datetime_helpers.py
Lines changed: 3 additions & 0 deletions
diff --git a/‎tableauserverclient/models/datasource_item.py
Lines changed: 4 additions & 8 deletions b/‎tableauserverclient/models/datasource_item.py
Lines changed: 4 additions & 8 deletions
diff --git a/‎tableauserverclient/models/schedule_item.py
Lines changed: 6 additions & 15 deletions b/‎tableauserverclient/models/schedule_item.py
Lines changed: 6 additions & 15 deletions
diff --git a/‎tableauserverclient/models/user_item.py
Lines changed: 2 additions & 1 deletion b/‎tableauserverclient/models/user_item.py
Lines changed: 2 additions & 1 deletion
diff --git a/‎tableauserverclient/models/workbook_item.py
Lines changed: 4 additions & 13 deletions b/‎tableauserverclient/models/workbook_item.py
Lines changed: 4 additions & 13 deletions
diff --git a/‎test/test_datasource.py
Lines changed: 9 additions & 8 deletions b/‎test/test_datasource.py
Lines changed: 9 additions & 8 deletions
diff --git a/‎test/test_datasource_model.py
Lines changed: 0 additions & 31 deletions b/‎test/test_datasource_model.py
Lines changed: 0 additions & 31 deletions
diff --git a/‎test/test_group.py
Lines changed: 2 additions & 1 deletion b/‎test/test_group.py
Lines changed: 2 additions & 1 deletion
diff --git a/‎test/test_schedule.py
Lines changed: 22 additions & 21 deletions b/‎test/test_schedule.py
Lines changed: 22 additions & 21 deletions
@@ -14,4 +14,4 @@ script:
   # Tests
   - python setup.py test
   # pep8 - disabled for now until we can scrub the files to make sure we pass before turning it on
-  - pycodestyle .
+  - pycodestyle tableauserverclient test
@@ -28,6 +28,9 @@ def dst(self, dt):
 
 
 def parse_datetime(date):
+    if date is None:
+        return None
+
     return datetime.datetime.strptime(date, TABLEAU_DATE_FORMAT).replace(tzinfo=utc)
 
 
 
@@ -1,8 +1,9 @@
 import xml.etree.ElementTree as ET
 from .exceptions import UnpopulatedPropertyError
-from .property_decorators import property_not_nullable, property_is_datetime
+from .property_decorators import property_not_nullable
 from .tag_item import TagItem
 from .. import NAMESPACE
+from ..datetime_helpers import parse_datetime
 
 
 class DatasourceItem(object):
@@ -34,11 +35,6 @@ def content_url(self):
     def created_at(self):
         return self._created_at
 
-    @created_at.setter
-    @property_is_datetime
-    def created_at(self, value):
-        self._created_at = value
-
     @property
     def id(self):
         return self._id
@@ -123,8 +119,8 @@ def _parse_element(datasource_xml):
         name = datasource_xml.get('name', None)
         datasource_type = datasource_xml.get('type', None)
         content_url = datasource_xml.get('contentUrl', None)
-        created_at = datasource_xml.get('createdAt', None)
-        updated_at = datasource_xml.get('updatedAt', None)
+        created_at = parse_datetime(datasource_xml.get('createdAt', None))
+        updated_at = parse_datetime(datasource_xml.get('updatedAt', None))
 
         tags = None
         tags_elem = datasource_xml.find('.//t:tags', namespaces=NAMESPACE)
 
@@ -2,8 +2,9 @@
 from datetime import datetime
 
 from .interval_item import IntervalItem, HourlyInterval, DailyInterval, WeeklyInterval, MonthlyInterval
-from .property_decorators import property_is_enum, property_not_nullable, property_is_int, property_is_datetime
+from .property_decorators import property_is_enum, property_not_nullable, property_is_int
 from .. import NAMESPACE
+from ..datetime_helpers import parse_datetime
 
 
 class ScheduleItem(object):
@@ -36,11 +37,6 @@ def __init__(self, name, priority, schedule_type, execution_order, interval_item
     def created_at(self):
         return self._created_at
 
-    @created_at.setter
-    @property_is_datetime
-    def created_at(self, value):
-        self._created_at = value
-
     @property
     def end_schedule_at(self):
         return self._end_schedule_at
@@ -103,11 +99,6 @@ def state(self, value):
     def updated_at(self):
         return self._updated_at
 
-    @updated_at.setter
-    @property_is_datetime
-    def updated_at(self, value):
-        self._updated_at = value
-
     def _parse_common_tags(self, schedule_xml):
         if not isinstance(schedule_xml, ET.Element):
             schedule_xml = ET.fromstring(schedule_xml).find('.//t:schedule', namespaces=NAMESPACE)
@@ -218,12 +209,12 @@ def _parse_element(schedule_xml):
         id = schedule_xml.get('id', None)
         name = schedule_xml.get('name', None)
         state = schedule_xml.get('state', None)
-        created_at = schedule_xml.get('createdAt', None)
-        updated_at = schedule_xml.get('updatedAt', None)
+        created_at = parse_datetime(schedule_xml.get('createdAt', None))
+        updated_at = parse_datetime(schedule_xml.get('updatedAt', None))
         schedule_type = schedule_xml.get('type', None)
         frequency = schedule_xml.get('frequency', None)
-        next_run_at = schedule_xml.get('nextRunAt', None)
-        end_schedule_at = schedule_xml.get('endScheduleAt', None)
+        next_run_at = parse_datetime(schedule_xml.get('nextRunAt', None))
+        end_schedule_at = parse_datetime(schedule_xml.get('endScheduleAt', None))
         execution_order = schedule_xml.get('executionOrder', None)
 
         priority = schedule_xml.get('priority', None)
 
@@ -2,6 +2,7 @@
 from .exceptions import UnpopulatedPropertyError
 from .property_decorators import property_is_enum, property_not_empty, property_not_nullable
 from .. import NAMESPACE
+from ..datetime_helpers import parse_datetime
 
 
 class UserItem(object):
@@ -135,7 +136,7 @@ def _parse_element(user_xml):
         id = user_xml.get('id', None)
         name = user_xml.get('name', None)
         site_role = user_xml.get('siteRole', None)
-        last_login = user_xml.get('lastLogin', None)
+        last_login = parse_datetime(user_xml.get('lastLogin', None))
         external_auth_user_id = user_xml.get('externalAuthUserId', None)
         fullname = user_xml.get('fullName', None)
         email = user_xml.get('email', None)
 
@@ -1,9 +1,10 @@
 import xml.etree.ElementTree as ET
 from .exceptions import UnpopulatedPropertyError
-from .property_decorators import property_not_nullable, property_is_boolean, property_is_datetime
+from .property_decorators import property_not_nullable, property_is_boolean
 from .tag_item import TagItem
 from .view_item import ViewItem
 from .. import NAMESPACE
+from ..datetime_helpers import parse_datetime
 import copy
 
 
@@ -40,11 +41,6 @@ def content_url(self):
     def created_at(self):
         return self._created_at
 
-    @created_at.setter
-    @property_is_datetime
-    def created_at(self, value):
-        self._created_at = value
-
     @property
     def id(self):
         return self._id
@@ -86,11 +82,6 @@ def size(self):
     def updated_at(self):
         return self._updated_at
 
-    @updated_at.setter
-    @property_is_datetime
-    def updated_at(self, value):
-        self._updated_at = value
-
     @property
     def views(self):
         if self._views is None:
@@ -173,8 +164,8 @@ def _parse_element(workbook_xml):
         id = workbook_xml.get('id', None)
         name = workbook_xml.get('name', None)
         content_url = workbook_xml.get('contentUrl', None)
-        created_at = workbook_xml.get('createdAt', None)
-        updated_at = workbook_xml.get('updatedAt', None)
+        created_at = parse_datetime(workbook_xml.get('createdAt', None))
+        updated_at = parse_datetime(workbook_xml.get('updatedAt', None))
 
         size = workbook_xml.get('size', None)
         if size:
 
@@ -2,6 +2,7 @@
 import os
 import requests_mock
 import tableauserverclient as TSC
+from tableauserverclient.datetime_helpers import format_datetime
 
 TEST_ASSET_DIR = os.path.join(os.path.dirname(__file__), 'assets')
 
@@ -33,8 +34,8 @@ def test_get(self):
         self.assertEqual('e76a1461-3b1d-4588-bf1b-17551a879ad9', all_datasources[0].id)
         self.assertEqual('dataengine', all_datasources[0].datasource_type)
         self.assertEqual('SampleDS', all_datasources[0].content_url)
-        self.assertEqual('2016-08-11T21:22:40Z', all_datasources[0].created_at)
-        self.assertEqual('2016-08-11T21:34:17Z', all_datasources[0].updated_at)
+        self.assertEqual('2016-08-11T21:22:40Z', format_datetime(all_datasources[0].created_at))
+        self.assertEqual('2016-08-11T21:34:17Z', format_datetime(all_datasources[0].updated_at))
         self.assertEqual('default', all_datasources[0].project_name)
         self.assertEqual('SampleDS', all_datasources[0].name)
         self.assertEqual('ee8c6e70-43b6-11e6-af4f-f7b0d8e20760', all_datasources[0].project_id)
@@ -43,8 +44,8 @@ def test_get(self):
         self.assertEqual('9dbd2263-16b5-46e1-9c43-a76bb8ab65fb', all_datasources[1].id)
         self.assertEqual('dataengine', all_datasources[1].datasource_type)
         self.assertEqual('Sampledatasource', all_datasources[1].content_url)
-        self.assertEqual('2016-08-04T21:31:55Z', all_datasources[1].created_at)
-        self.assertEqual('2016-08-04T21:31:55Z', all_datasources[1].updated_at)
+        self.assertEqual('2016-08-04T21:31:55Z', format_datetime(all_datasources[1].created_at))
+        self.assertEqual('2016-08-04T21:31:55Z', format_datetime(all_datasources[1].updated_at))
         self.assertEqual('default', all_datasources[1].project_name)
         self.assertEqual('Sample datasource', all_datasources[1].name)
         self.assertEqual('ee8c6e70-43b6-11e6-af4f-f7b0d8e20760', all_datasources[1].project_id)
@@ -75,8 +76,8 @@ def test_get_by_id(self):
         self.assertEqual('9dbd2263-16b5-46e1-9c43-a76bb8ab65fb', single_datasource.id)
         self.assertEqual('dataengine', single_datasource.datasource_type)
         self.assertEqual('Sampledatasource', single_datasource.content_url)
-        self.assertEqual('2016-08-04T21:31:55Z', single_datasource.created_at)
-        self.assertEqual('2016-08-04T21:31:55Z', single_datasource.updated_at)
+        self.assertEqual('2016-08-04T21:31:55Z', format_datetime(single_datasource.created_at))
+        self.assertEqual('2016-08-04T21:31:55Z', format_datetime(single_datasource.updated_at))
         self.assertEqual('default', single_datasource.project_name)
         self.assertEqual('Sample datasource', single_datasource.name)
         self.assertEqual('ee8c6e70-43b6-11e6-af4f-f7b0d8e20760', single_datasource.project_id)
@@ -125,8 +126,8 @@ def test_publish(self):
         self.assertEqual('SampleDS', new_datasource.name)
         self.assertEqual('SampleDS', new_datasource.content_url)
         self.assertEqual('dataengine', new_datasource.datasource_type)
-        self.assertEqual('2016-08-11T21:22:40Z', new_datasource.created_at)
-        self.assertEqual('2016-08-17T23:37:08Z', new_datasource.updated_at)
+        self.assertEqual('2016-08-11T21:22:40Z', format_datetime(new_datasource.created_at))
+        self.assertEqual('2016-08-17T23:37:08Z', format_datetime(new_datasource.updated_at))
         self.assertEqual('ee8c6e70-43b6-11e6-af4f-f7b0d8e20760', new_datasource.project_id)
         self.assertEqual('default', new_datasource.project_name)
         self.assertEqual('5de011f8-5aa9-4d5b-b991-f462c8dd6bb7', new_datasource.owner_id)
 
@@ -9,34 +9,3 @@ def test_invalid_project_id(self):
         datasource = TSC.DatasourceItem("10")
         with self.assertRaises(ValueError):
             datasource.project_id = None
-
-    def test_datetime_conversion(self):
-        datasource = TSC.DatasourceItem("10")
-        datasource.created_at = "2016-08-18T19:25:36Z"
-        actual = datasource.created_at
-        self.assertIsInstance(actual, datetime.datetime)
-   
10000
     self.assertEquals(actual.year, 2016)
-        self.assertEquals(actual.month, 8)
-        self.assertEquals(actual.day, 18)
-        self.assertEquals(actual.hour, 19)
-        self.assertEquals(actual.minute, 25)
-        self.assertEquals(actual.second, 36)
-
-    def test_datetime_conversion_allows_datetime_passthrough(self):
-        datasource = TSC.DatasourceItem("10")
-        now = datetime.datetime.utcnow()
-        datasource.created_at = now
-        self.assertEquals(datasource.created_at, now)
-
-    def test_datetime_conversion_is_timezone_aware(self):
-        datasource = TSC.DatasourceItem("10")
-        datasource.created_at = "2016-08-18T19:25:36Z"
-        actual = datasource.created_at
-        self.assertEquals(actual.utcoffset().seconds, 0)
-
-    def test_datetime_conversion_rejects_things_that_cannot_be_converted(self):
-        datasource = TSC.DatasourceItem("10")
-        with self.assertRaises(ValueError):
-            datasource.created_at = object()
-        with self.assertRaises(ValueError):
-            datasource.created_at = "This is so not a datetime"
@@ -3,6 +3,7 @@
 import os
 import requests_mock
 import tableauserverclient as TSC
+from tableauserverclient.datetime_helpers import format_datetime
 
 TEST_ASSET_DIR = os.path.join(os.path.dirname(__file__), 'assets')
 
@@ -61,7 +62,7 @@ def test_populate_users(self):
         self.assertEqual('dd2239f6-ddf1-4107-981a-4cf94e415794', user.id)
         self.assertEqual('alice', user.name)
         self.assertEqual('Publisher', user.site_role)
-        self.assertEqual('2016-08-16T23:17:06Z', user.last_login)
+        self.assertEqual('2016-08-16T23:17:06Z', format_datetime(user.last_login))
 
     def test_delete(self):
         with requests_mock.mock() as m:
 
@@ -1,8 +1,9 @@
+from datetime import time
 import unittest
 import os
 import requests_mock
 import tableauserverclient as TSC
-from datetime import time
+from tableauserverclient.datetime_helpers import format_datetime
 
 TEST_ASSET_DIR = os.path.join(os.path.dirname(__file__), "assets")
 
@@ -37,19 +38,19 @@ def test_get(self):
         self.assertEqual("Weekday early mornings", all_schedules[0].name)
         self.assertEqual("Active", all_schedules[0].state)
         self.assertEqual(50, all_schedules[0].priority)
-        self.assertEqual("2016-07-06T20:19:00Z", all_schedules[0].created_at)
-        self.assertEqual("2016-09-13T11:00:32Z", all_schedules[0].updated_at)
+        self.assertEqual("2016-07-06T20:19:00Z", format_datetime(all_schedules[0].created_at))
+        self.assertEqual("2016-09-13T11:00:32Z", format_datetime(all_schedules[0].updated_at))
         self.assertEqual("Extract", all_schedules[0].schedule_type)
-        self.assertEqual("2016-09-14T11:00:00Z", all_schedules[0].next_run_at)
+        self.assertEqual("2016-09-14T11:00:00Z", format_datetime(all_schedules[0].next_run_at))
 
         self.assertEqual("bcb79d07-6e47-472f-8a65-d7f51f40c36c", all_schedules[1].id)
         self.assertEqual("Saturday night", all_schedules[1].name)
         self.assertEqual("Active", all_schedules[1].state)
         self.assertEqual(80, all_schedules[1].priority)
-        self.assertEqual("2016-07-07T20:19:00Z", all_schedules[1].created_at)
-        self.assertEqual("2016-09-12T16:39:38Z", all_schedules[1].updated_at)
+        self.assertEqual("2016-07-07T20:19:00Z", format_datetime(all_schedules[1].created_at))
+        self.assertEqual("2016-09-12T16:39:38Z", format_datetime(all_schedules[1].updated_at))
         self.assertEqual("Subscription", all_schedules[1].schedule_type)
-        self.assertEqual("2016-09-18T06:00:00Z", all_schedules[1].next_run_at)
+        self.assertEqual("2016-09-18T06:00:00Z", format_datetime(all_schedules[1].next_run_at))
 
     def test_get_empty(self):
         with open(GET_EMPTY_XML, "rb") as f:
@@ -82,10 +83,10 @@ def test_create_hourly(self):
         self.assertEqual("hourly-schedule-1", new_schedule.name)
         self.assertEqual("Active", new_schedule.state)
         self.assertEqual(50, new_schedule.priority)
-        self.assertEqual("2016-09-15T20:47:33Z", new_schedule.created_at)
-        self.assertEqual("2016-09-15T20:47:33Z", new_schedule.updated_at)
+        self.assertEqual("2016-09-15T20:47:33Z", format_datetime(new_schedule.created_at))
+        self.assertEqual("2016-09-15T20:47:33Z", format_datetime(new_schedule.updated_at))
         self.assertEqual(TSC.ScheduleItem.Type.Extract, new_schedule.schedule_type)
-        self.assertEqual("2016-09-16T01:30:00Z", new_schedule.next_run_at)
+        self.assertEqual("2016-09-16T01:30:00Z", format_datetime(new_schedule.next_run_at))
         self.assertEqual(TSC.ScheduleItem.ExecutionOrder.Parallel, new_schedule.execution_order)
         self.assertEqual(time(2, 30), new_schedule.interval_item.start_time)
         self.assertEqual(time(23), new_schedule.interval_item.end_time)
@@ -105,10 +106,10 @@ def test_create_daily(self):
         self.assertEqual("daily-schedule-1", new_schedule.name)
         self.assertEqual("Active", new_schedule.state)
         self.assertEqual(90, new_schedule.priority)
-        self.assertEqual("2016-09-15T21:01:09Z", new_schedule.created_at)
-        self.assertEqual("2016-09-15T21:01:09Z", new_schedule.updated_at)
+        self.assertEqual("2016-09-15T21:01:09Z", format_datetime(new_schedule.created_at))
+        self.assertEqual("2016-09-15T21:01:09Z", format_datetime(new_schedule.updated_at))
         self.assertEqual(TSC.ScheduleItem.Type.Subscription, new_schedule.schedule_type)
-        self.assertEqual("2016-09-16T11:45:00Z", new_schedule.next_run_at)
+        self.assertEqual("2016-09-16T11:45:00Z", format_datetime(new_schedule.next_run_at))
         self.assertEqual(TSC.ScheduleItem.ExecutionOrder.Serial, new_schedule.execution_order)
         self.assertEqual(time(4, 45), new_schedule.interval_item.start_time)
 
@@ -128,10 +129,10 @@ def test_create_weekly(self):
         self.assertEqual("weekly-schedule-1", new_schedule.name)
         self.assertEqual("Active", new_schedule.state)
         self.assertEqual(80, new_schedule.priority)
-        self.assertEqual("2016-09-15T21:12:50Z", new_schedule.created_at)
-        self.assertEqual("2016-09-15T21:12:50Z", new_schedule.updated_at)
+        self.assertEqual("2016-09-15T21:12:50Z", format_datetime(new_schedule.created_at))
+        self.assertEqual("2016-09-15T21:12:50Z", format_datetime(new_schedule.updated_at))
         self.assertEqual(TSC.ScheduleItem.Type.Extract, new_schedule.schedule_type)
-        self.assertEqual("2016-09-16T16:15:00Z", new_schedule.next_run_at)
+        self.assertEqual("2016-09-16T16:15:00Z", format_datetime(new_schedule.next_run_at))
         self.assertEqual(TSC.ScheduleItem.ExecutionOrder.Parallel, new_schedule.execution_order)
         self.assertEqual(time(9, 15), new_schedule.interval_item.start_time)
         self.assertEqual(("Monday", "Wednesday", "Friday"),
@@ -151,10 +152,10 @@ def test_create_monthly(self):
         self.assertEqual("monthly-schedule-1", new_schedule.name)
         self.assertEqual("Active", new_schedule.state)
         self.assertEqual(20, new_schedule.priority)
-        self.assertEqual("2016-09-15T21:16:56Z", new_schedule.created_at)
-        self.assertEqual("2016-09-15T21:16:56Z", new_schedule.updated_at)
+        self.assertEqual("2016-09-15T21:16:56Z", format_datetime(new_schedule.created_at))
+        self.assertEqual("2016-09-15T21:16:56Z", format_datetime(new_schedule.updated_at))
         self.assertEqual(TSC.ScheduleItem.Type.Extract, new_schedule.schedule_type)
-        self.assertEqual("2016-10-12T14:00:00Z", new_schedule.next_run_at)
+        self.assertEqual("2016-10-12T14:00:00Z", format_datetime(new_schedule.next_run_at))
         self.assertEqual(TSC.ScheduleItem.ExecutionOrder.Serial, new_schedule.execution_order)
         self.assertEqual(time(7), new_schedule.interval_item.start_time)
         self.assertEqual("12", new_schedule.interval_item.interval)
@@ -174,9 +175,9 @@ def test_update(self):
         self.assertEqual("7bea1766-1543-4052-9753-9d224bc069b5", single_schedule.id)
         self.assertEqual("weekly-schedule-1", single_schedule.name)
         self.assertEqual(90, single_schedule.priority)
-        self.assertEqual("2016-09-15T23:50:02Z", single_schedule.updated_at)
+        self.assertEqual("2016-09-15T23:50:02Z", format_datetime(single_schedule.updated_at))
         self.assertEqual(TSC.ScheduleItem.Type.Extract, single_schedule.schedule_type)
-        self.assertEqual("2016-09-16T14:00:00Z", single_schedule.next_run_at)
+        self.assertEqual("2016-09-16T14:00:00Z", format_datetime(single_schedule.next_run_at))
         self.assertEqual(TSC.ScheduleItem.ExecutionOrder.Parallel, single_schedule.execution_order)
         self.assertEqual(time(7), single_schedule.interval_item.start_time)
         self.assertEqual(("Monday", "Friday"),