davidmoss
diff --git a/‎github3/models.py
Lines changed: 6 additions & 2 deletions b/‎github3/models.py
Lines changed: 6 additions & 2 deletions
diff --git a/‎github3/utils.py
Lines changed: 20 additions & 1 deletion b/‎github3/utils.py
Lines changed: 20 additions & 1 deletion
diff --git a/‎tests/test_models.py
Lines changed: 7 additions & 0 deletions b/‎tests/test_models.py
Lines changed: 7 additions & 0 deletions
@@ -12,6 +12,7 @@
 from requests.compat import urlparse, is_py2
 from github3.decorators import requires_auth
 from github3.session import GitHubSession
+from github3.utils import UTC
 from datetime import datetime
 from logging import getLogger
 
@@ -36,9 +37,12 @@ def to_json(self):
         return self._json_data
 
     def _strptime(self, time_str):
-        """Converts an ISO 8601 formatted string into a datetime object."""
+        """Convert an ISO 8601 formatted string in UTC into a
+        timezone-aware datetime object."""
         if time_str:
-            return datetime.strptime(time_str, __timeformat__)
+            # Parse UTC string into naive datetime, then add timezone
+            dt = datetime.strptime(time_str, __timeformat__)
+            return dt.replace(tzinfo=UTC())
         return None
 
     def _repr(self):
 
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from collections import Callable
-from datetime import datetime
+from datetime import datetime, timedelta, tzinfo
 from requests.compat import basestring
 import re
 
@@ -30,6 +30,25 @@ def timestamp_parameter(timestamp, allow_none=True):
     raise ValueError("Cannot accept type %s for timestamp" % type(timestamp))
 
 
+class UTC(tzinfo):
+    """Yet another UTC reimplementation, to avoid a dependency on pytz or
+    dateutil."""
+
+    ZERO = timedelta(0)
+
+    def __repr__(self):
+        return 'UTC()'
+
+    def dst(self, dt):
+        return self.ZERO
+
+    def tzname(self, dt):
+        return 'UTC'
+
+    def utcoffset(self, dt):
+        return self.ZERO
+
+
 def stream_response_to_file(response, path=None):
     pre_opened = False
     fd = None
 
@@ -1,3 +1,4 @@
+from datetime import timedelta
 import github3
 import requests
 from tests.utils import BaseCase, TestCase, RequestsBytesIO, is_py3
@@ -36,6 +37,12 @@ def test_boolean(self):
 
         self.assertRaises(github3.GitHubError, self.g._boolean, r, 200, 404)
 
+    def test_strptime(self):
+        dt = self.g._strptime('2013-06-18T19:53:04Z')
+        assert dt.tzname() == 'UTC'
+        assert dt.dst() == timedelta(0)
+        assert dt.utcoffset() == timedelta(0)
+
 
 class TestGitHubError(TestCase):
     def __init__(self, methodName='runTest'):