@@ -13,10 +13,11 @@ import Data.Char
1313import Data.Maybe
1414import Data.Time
1515import Control.Applicative
16+import Data.Time (ParseTime)
1617#if MIN_VERSION_time(1,5,0)
17−import Data.Time.Format (defaultTimeLocale)
18+import Data.Time.Format (TimeLocale, defaultTimeLocale)
1819#else
19−import System.Locale (defaultTimeLocale)
20+import System.Locale (TimeLocale, defaultTimeLocale)
2021#endif
2122import qualified Data.ByteString as B
2223import qualified Data.ByteString.Base64 as Base64
@@ -32,6 +33,13 @@ import qualified Text.Blaze.Html as Blaze
3233import qualified Text.Blaze.Html.Renderer.Text as Blaze
3334
3435
36+timeParse :: ParseTime t => TimeLocale -> String -> String -> Maybe t
37+#if MIN_VERSION_time(1,5,0)
38+timeParse = parseTimeM True
39+#else
40+timeParse = parseTime
41+#endif
42+
3543--------------------------------------------------------------------------------
3644data MandrillError = MandrillError {
3745 _merr_status :: !T.Text
@@ -334,6 +342,6 @@ instance ToJSON MandrillDate where
334342
335343instance FromJSON MandrillDate where
336344 parseJSON = withText "MandrillDate" $ \t ->
337− case parseTimeM True defaultTimeLocale "%Y-%m-%d %I:%M:%S%Q" (T.unpack t) of
345+ case timeParse defaultTimeLocale "%Y-%m-%d %I:%M:%S%Q" (T.unpack t) of
338346 Just d -> pure $ MandrillDate d
339347 _ -> fail "could not parse Mandrill date"