@@ -124,6 +124,7 @@ import Text.Pandoc.Pretty (charWidth)
124124import Text.Pandoc.Compat.Time
125125import Data.Time.Clock.POSIX
126126import System.IO (stderr)
127+import System.IO.Error
127128import System.IO.Temp
128129import Text.HTML.TagSoup (renderTagsOptions, RenderOptions(..), Tag(..),
129130 renderOptions)
@@ -730,17 +731,19 @@ readDataFileUTF8 userDir fname =
730731 UTF8.toString `fmap` readDataFile userDir fname
731732
732733-- | Read from a URL and return raw data and maybe mime type.
733−openURL :: String -> IO (Either E.SomeException (BS.ByteString, Maybe MimeType))
734+openURL :: String -> IO (BS.ByteString, Maybe MimeType)
734735openURL u
735736 | Just u'' <- stripPrefix "data:" u =
736737 let mime = takeWhile (/=',') u''
737738 contents = B8.pack $ unEscapeString $ drop 1 $ dropWhile (/=',') u''
738− in return $ Right (decodeLenient contents, Just mime)
739+ in return (decodeLenient contents, Just mime)
739740#ifdef HTTP_CLIENT
740− | otherwise = withSocketsDo $ E.try $ do
741+ | otherwise = withSocketsDo $ do
741742 let parseReq = parseRequest
742− (proxy :: Either E.SomeException String) <- E.try $ getEnv "http_proxy"
743− (useragent :: Either E.SomeException String) <- E.try $ getEnv "USER_AGENT"
743+ (proxy :: Either IOError String) <-
744+ tryIOError $ getEnv "http_proxy"
745+ (useragent :: Either IOError String) <-
746+ tryIOError $ getEnv "USER_AGENT"
744747 req <- parseReq u
745748 req' <- case proxy of
746749 Left _ -> return req
@@ -758,7 +761,7 @@ openURL u
758761 return (BS.concat $ toChunks $ responseBody resp,
759762 UTF8.toString `fmap` lookup hContentType (responseHeaders resp))
760763#else
761− | otherwise = E.try $ getBodyAndMimeType `fmap` browse
764+ | otherwise = getBodyAndMimeType `fmap` browse
762765 (do liftIO $ UTF8.hPutStrLn stderr $ "Fetching " ++ u ++ "..."
763766 setOutHandler $ const (return ())
764767 setAllowRedirects True