git.iko.soy/typeable/pandoc
on master help sign in
Fixed compilation with http-conduit flag False.
commit7024664ddae00fc459953bb5d4bbc91d5877be1b authorJohn MacFarlane <fiddlosopher@gmail.com> dateTue 30 Jul 2013, 08:38 (13 years ago) parent3c06e26
1 file changed+2−2
src/Text/Pandoc/Shared.hs+2−2
src/Text/Pandoc/Shared.hs+2−2
@@ -104,7 +104,6 @@ import System.IO (stderr)
104104import Text.HTML.TagSoup (renderTagsOptions, RenderOptions(..), Tag(..),
105105 renderOptions)
106106import qualified Data.ByteString as BS
107−import Data.ByteString.Lazy (toChunks)
108107import qualified Data.ByteString.Char8 as B8
109108
110109#ifdef EMBED_DATA_FILES
@@ -114,6 +113,7 @@ import System.FilePath ( joinPath, splitDirectories )
114113import Paths_pandoc (getDataFileName)
115114#endif
116115#ifdef HTTP_CONDUIT
116+import Data.ByteString.Lazy (toChunks)
117117import Network.HTTP.Conduit (httpLbs, parseUrl, withManager,
118118 responseBody, responseHeaders)
119119import Network.HTTP.Types.Header ( hContentType)
@@ -616,7 +616,7 @@ openURL u
616616 UTF8.toString `fmap` lookup hContentType (responseHeaders resp))
617617#else
618618 | otherwise = E.try $ getBodyAndMimeType `fmap` browse
619− (do UTF8.hPutStrLn stderr $ "Fetching " ++ u ++ "..."
619+ (do S.liftIO $ UTF8.hPutStrLn stderr $ "Fetching " ++ u ++ "..."
620620 setOutHandler $ const (return ())
621621 setAllowRedirects True
622622 request (getRequest' u'))