8d04c82 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Avoid `import Prelude hiding (catch)`.

8d04c82John MacFarlane12 years ago

src/Text/Pandoc/UTF8.hs+1−2

compare with master

unifiedsplit

@@ -51,8 +51,7 @@ import System.IO hiding (readFile, writeFile, getContents,

51#if MIN_VERSION_base(4,6,0)

52import Prelude hiding (readFile, writeFile, getContents, putStr, putStrLn)

53#else

54−import Prelude hiding (readFile, writeFile, getContents, putStr, putStrLn,

54+import Prelude hiding (readFile, writeFile, getContents, putStr, putStrLn)

55− catch)

56#endif

55#endif

57import qualified System.IO as IO

56import qualified System.IO as IO

58import qualified Data.ByteString.Char8 as B

57import qualified Data.ByteString.Char8 as B

src/Text/Pandoc/Writers/EPUB.hs+3−7

@@ -59,11 +59,7 @@ import Text.Pandoc.Writers.Markdown ( writePlain )

59import Data.Char ( toLower, isDigit, isAlphaNum )

60import Network.URI ( unEscapeString )

61import Text.Pandoc.MIME (getMimeType)

62−#if MIN_VERSION_base(4,6,0)

63−#else

64−import Prelude hiding (catch)

65−#endif

66−import Control.Exception (catch, SomeException)

62+import qualified Control.Exception as E

67import Text.Blaze.Html.Renderer.Utf8 (renderHtml)

63import Text.Blaze.Html.Renderer.Utf8 (renderHtml)

68import Text.HTML.TagSoup

64import Text.HTML.TagSoup

@@ -153,10 +149,10 @@ getEPUBMetadata opts meta = do

153 then case lookup "lang" (writerVariables opts) of

149 then case lookup "lang" (writerVariables opts) of

154 Just x -> return m{ epubLanguage = x }

150 Just x -> return m{ epubLanguage = x }

155 Nothing -> do

151 Nothing -> do

156− localeLang <- catch (liftM

152+ localeLang <- E.catch (liftM

157 (map (\c -> if c == '_' then '-' else c) .

153 (map (\c -> if c == '_' then '-' else c) .

158 takeWhile (/='.')) $ getEnv "LANG")

154 takeWhile (/='.')) $ getEnv "LANG")

159− (\e -> let _ = (e :: SomeException) in return "en-US")

155+ (\e -> let _ = (e :: E.SomeException) in return "en-US")

160 return m{ epubLanguage = localeLang }

156 return m{ epubLanguage = localeLang }

161 else return m

157 else return m

162 let fixDate m =

158 let fixDate m =