Merge pull request #200 from liyang/master

Data.Aeson.Types.Instances: fix UTCTime for years outside of [0, 9999]
haskell · Jul 2, 2014 · 49a13d2 · 49a13d2
2 parents a6f3870 + 4bee2d4
commit 49a13d2
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Data/Aeson/Types/Instances.hs b/Data/Aeson/Types/Instances.hs
@@ -497,8 +497,9 @@ instance FromJSON ZonedTime where
     parseJSON v = typeMismatch "ZonedTime" v
 
 instance ToJSON UTCTime where
-    toJSON t = String (pack (take 23 str ++ "Z"))
-      where str = formatTime defaultTimeLocale "%FT%T.%q" t
+    toJSON t = String $ pack $ formatTime defaultTimeLocale format t
+      where
+        format = "%FT%T." ++ formatMillis t ++ "Z"
     {-# INLINE toJSON #-}
 
 instance FromJSON UTCTime where