Browse Source

Merge commit 'faf62cfe51a5715c79e97d97600ff453dbe4bbf6'

tags/v0.2.3.0
Peter J. Jones 2 years ago
parent
commit
b5e56ec772
Signed by: Peter Jones <pjones@devalot.com> GPG Key ID: 9DAFAA8D01941E49

+ 1
- 0
vendor/themoviedb/CHANGES.md View File

@@ -3,6 +3,7 @@
## 1.1.3.0 (March 18, 2017)

- Widen dependencies for LTS-7.20
- Build with latest Hackage too!

## 1.1.2.0 (June 9, 2016)


+ 3
- 3
vendor/themoviedb/src/Network/API/TheMovieDB/Internal/HTTP.hs View File

@@ -57,6 +57,7 @@ apiGET manager key path params = do
request <- mkAPIRequest key path params
response <- catch (Right <$> HC.httpLbs request manager) httpError


return $ case response of
Left e -> Left e
Right r
@@ -64,7 +65,6 @@ apiGET manager key path params = do
| otherwise -> Left (ServiceError . show $ HC.responseStatus r)

where
-- This should only be called for non-200 codes now.
httpError :: HC.HttpException -> IO (Either Error (HC.Response Body))
httpError e = return $ case e of
HC.StatusCodeException (Status 401 _) _ _ -> Left InvalidKeyError
_ -> Left (HttpExceptionError e)
httpError _ = return $ Left InvalidKeyError

+ 4
- 4
vendor/themoviedb/themoviedb.cabal View File

@@ -60,13 +60,13 @@ library
if flag(maintainer)
ghc-options: -Werror

build-depends: aeson >= 0.6 && < 0.12
build-depends: aeson >= 0.6 && < 1.2
, base >= 4.6 && < 5.0
, binary >= 0.7 && < 0.9
, binary >= 0.7 && < 0.10
, bytestring >= 0.9 && < 0.11
, either >= 4.3 && < 4.5
, http-client >= 0.4.31 && < 0.5
, http-client-tls >= 0.2.2 && < 0.3
, http-client >= 0.4.31 && < 0.6
, http-client-tls >= 0.2.2 && < 0.4
, http-types >= 0.8 && < 0.10
, mtl >= 2.1 && < 2.3
, text >= 0.11 && < 1.3

Loading…
Cancel
Save