From 334974dedd14eead44b5f73587e2bdce34188c80 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Fri, 3 Sep 2010 23:39:11 +0000
Subject: [PATCH] fix double error message output, clean up some
 ghc-version-specific imports

---
 hledger-lib/Hledger/Read.hs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hledger-lib/Hledger/Read.hs b/hledger-lib/Hledger/Read.hs
index 0e5f87c07..e7128de26 100644
--- a/hledger-lib/Hledger/Read.hs
+++ b/hledger-lib/Hledger/Read.hs
@@ -29,12 +29,12 @@ import Safe (headDef)
 import System.Directory (doesFileExist, getHomeDirectory)
 import System.Environment (getEnv)
 import System.FilePath ((</>))
-import System.IO (IOMode(..), withFile, hGetContents, stderr)
+import System.IO (IOMode(..), withFile, stderr)
 #if __GLASGOW_HASKELL__ <= 610
-import Prelude hiding (readFile, putStr, putStrLn, print, getContents)
-import System.IO.UTF8
+import Prelude hiding (getContents)
+import System.IO.UTF8 (getContents, hGetContents)
 #else
-import System.IO (hPutStrLn)
+import System.IO (hGetContents)
 #endif
 
 
@@ -70,7 +70,7 @@ journalFromPathAndString format fp s = do
                                 Nothing -> readers
   (errors, journals) <- partitionEithers `fmap` mapM tryReader readers'
   case journals of j:_ -> return $ Right j
-                   _   -> let s = errMsg errors in hPutStrLn stderr s >> return (Left s)
+                   _   -> return $ Left $ errMsg errors
     where
       tryReader r = (runErrorT . (rParser r) fp) s
       errMsg [] = unknownFormatMsg