diff options
| author | John MacFarlane <fiddlosopher@gmail.com> | 2013-07-30 08:38:13 -0700 |
|---|---|---|
| committer | John MacFarlane <fiddlosopher@gmail.com> | 2013-07-30 08:38:13 -0700 |
| commit | 7024664ddae00fc459953bb5d4bbc91d5877be1b (patch) | |
| tree | e6e7a576abb8ec7e6b16cd80678e9f6085ccaba4 /src/Text | |
| parent | 3c06e2692a8fd7307658498b44401868e1059d61 (diff) | |
| download | pandoc-7024664ddae00fc459953bb5d4bbc91d5877be1b.tar.gz | |
Fixed compilation with http-conduit flag False.
Diffstat (limited to 'src/Text')
| -rw-r--r-- | src/Text/Pandoc/Shared.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Shared.hs b/src/Text/Pandoc/Shared.hs index 0f2e16d2e..09874299d 100644 --- a/src/Text/Pandoc/Shared.hs +++ b/src/Text/Pandoc/Shared.hs @@ -104,7 +104,6 @@ import System.IO (stderr) import Text.HTML.TagSoup (renderTagsOptions, RenderOptions(..), Tag(..), renderOptions) import qualified Data.ByteString as BS -import Data.ByteString.Lazy (toChunks) import qualified Data.ByteString.Char8 as B8 #ifdef EMBED_DATA_FILES @@ -114,6 +113,7 @@ import System.FilePath ( joinPath, splitDirectories ) import Paths_pandoc (getDataFileName) #endif #ifdef HTTP_CONDUIT +import Data.ByteString.Lazy (toChunks) import Network.HTTP.Conduit (httpLbs, parseUrl, withManager, responseBody, responseHeaders) import Network.HTTP.Types.Header ( hContentType) @@ -616,7 +616,7 @@ openURL u UTF8.toString `fmap` lookup hContentType (responseHeaders resp)) #else | otherwise = E.try $ getBodyAndMimeType `fmap` browse - (do UTF8.hPutStrLn stderr $ "Fetching " ++ u ++ "..." + (do S.liftIO $ UTF8.hPutStrLn stderr $ "Fetching " ++ u ++ "..." setOutHandler $ const (return ()) setAllowRedirects True request (getRequest' u')) |