# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1421945422 -3600
# Node ID eff00f10d12abf19727e0039580d158e0494eeeb
# Parent  7aced2683c802d6ad68c0b0fad5822149654ce0f
Handle "naive" datetimes in to_utc_datetime.

diff -r 7aced2683c80 -r eff00f10d12a imiptools/dates.py
--- a/imiptools/dates.py	Wed Jan 21 19:04:10 2015 +0100
+++ b/imiptools/dates.py	Thu Jan 22 17:50:22 2015 +0100
@@ -39,7 +39,7 @@
     if not dt:
         return None
     elif isinstance(dt, datetime):
-        return dt.astimezone(timezone("UTC"))
+        return to_timezone(dt, "UTC")
     else:
         return dt
 
@@ -48,6 +48,9 @@
         tz = name and timezone(name) or None
     except UnknownTimeZoneError:
         tz = None
+    return to_tz(dt, tz)
+
+def to_tz(dt, tz):
     if tz is not None:
         if not dt.tzinfo:
             return tz.localize(dt)