Skip to content

Commit 807790c

Browse files
author
Lars Kuhtz
committed
SignatureV4: fix compiler warnings related to time package
1 parent ed0cbd1 commit 807790c

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

src/Aws/SignatureV4.hs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ import Data.String
119119
import qualified Data.Text as T
120120
import qualified Data.Text.Encoding as T
121121
import Data.Time.Clock (UTCTime, getCurrentTime, utctDay)
122-
import Data.Time.Format (formatTime, parseTime)
123122
import Data.Typeable
124123

125124
import qualified Test.QuickCheck as Q
@@ -129,8 +128,9 @@ import qualified Text.Parser.Char as P
129128
import qualified Text.Parser.Combinators as P
130129

131130
#if MIN_VERSION_time(1,5,0)
132-
import Data.Time.Format
131+
import Data.Time.Format (defaultTimeLocale, formatTime, parseTimeM)
133132
#else
133+
import Data.Time.Format (formatTime, parseTime)
134134
import System.Locale
135135
#endif
136136

@@ -342,8 +342,12 @@ parseHttpDate s =
342342
<|> p "%Y-%m-%dT%H:%M:%S%QZ" s -- iso 8601
343343
<|> p "%Y-%m-%dT%H:%M:%S%Q%Z" s -- iso 8601
344344
where
345+
#if MIN_VERSION_time(1,5,0)
346+
p = parseTimeM True defaultTimeLocale
347+
#else
345348
p = parseTime defaultTimeLocale
346349
#endif
350+
#endif
347351

348352
-- | Normalization of the date header breaks the AWS test suite, since the
349353
-- tests in that test suite use an invalid date.
@@ -451,9 +455,14 @@ parseCredentialScope = CredentialScope
451455
where
452456
time = do
453457
str <- P.count 8 P.digit
454-
case parseTime defaultTimeLocale credentialScopeDateFormat str of
458+
case p credentialScopeDateFormat str of
455459
Nothing -> fail $ "failed to parse credential scope date: " <> str
456460
Just t -> return t
461+
#if MIN_VERSION_time(1,5,0)
462+
p = parseTimeM True defaultTimeLocale
463+
#else
464+
p = parseTime defaultTimeLocale
465+
#endif
457466

458467
terminationString :: IsString a => a
459468
terminationString = "aws4_request"

0 commit comments

Comments
 (0)