@@ -140,7 +140,6 @@ import Text.Pandoc.Data (dataFiles)
140140#else
141141import Paths_pandoc (getDataFileName)
142142#endif
143−#ifdef HTTP_CLIENT
144143import Network.HTTP.Client (httpLbs, responseBody, responseHeaders,
145144 Request(port,host,requestHeaders))
146145import Network.HTTP.Client (parseRequest)
@@ -150,12 +149,6 @@ import Network.HTTP.Client.TLS (tlsManagerSettings)
150149import System.Environment (getEnv)
151150import Network.HTTP.Types.Header ( hContentType, hUserAgent)
152151import Network (withSocketsDo)
153−#else
154−import Network.URI (parseURI)
155−import Network.HTTP (findHeader, rspBody,
156− RequestMethod(..), HeaderName(..), mkRequest)
157−import Network.Browser (browse, setAllowRedirects, setOutHandler, request)
158−#endif
159152
160153-- | Version number of pandoc library.
161154pandocVersion :: String
@@ -715,7 +708,6 @@ openURL u
715708 let mime = takeWhile (/=',') u''
716709 contents = B8.pack $ unEscapeString $ drop 1 $ dropWhile (/=',') u''
717710 in return (decodeLenient contents, Just mime)
718−#ifdef HTTP_CLIENT
719711 | otherwise = withSocketsDo $ do
720712 let parseReq = parseRequest
721713 (proxy :: Either IOError String) <-
@@ -738,19 +730,6 @@ openURL u
738730 resp <- newManager tlsManagerSettings >>= httpLbs req''
739731 return (BS.concat $ toChunks $ responseBody resp,
740732 UTF8.toString `fmap` lookup hContentType (responseHeaders resp))
741−#else
742− | otherwise = getBodyAndMimeType `fmap` browse
743− (do liftIO $ UTF8.hPutStrLn stderr $ "Fetching " ++ u ++ "..."
744− setOutHandler $ const (return ())
745− setAllowRedirects True
746− request (getRequest' u'))
747− where getBodyAndMimeType (_, r) = (rspBody r, findHeader HdrContentType r)
748− getRequest' uriString = case parseURI uriString of
749− Nothing -> error ("Not a valid URL: " ++
750− uriString)
751− Just v -> mkRequest GET v
752− u' = escapeURIString (/= '|') u -- pipes are rejected by Network.URI
753−#endif
754733
755734--
756735-- Error reporting