fix!: Revert "fix!: utf-8: Use with-utf8 to ensure all files are read and written with utf8 encoding. (#1619)"

This reverts commit e233f001c5.

This would break at least some people's workflow. A lighter touch is
probably sufficient.

bin/hledger-balance-as-budget.hs

@@ -8,7 +8,7 @@
 {-| Construct two balance reports for two different time periods and use one of the as "budget" for
     the other, thus comparing them
 -}
-import Data.Text.Lazy.IO as TL (putStrLn)  -- Only putStr and friends are safe
+import Data.Text.Lazy.IO as TL
 import System.Environment (getArgs)
 import Hledger.Cli
 

bin/hledger-check-fancyassertions.hs

@@ -112,7 +112,7 @@ import Data.Time.Calendar (toGregorian)
 import Data.Time.Calendar.OrdinalDate (mondayStartWeek, sundayStartWeek, toOrdinalDate)
 import Data.Text (Text, isPrefixOf, pack, unpack)
 import qualified Data.Text as T
-import qualified Data.Text.IO as T (putStrLn)  -- Only putStr and friends are safe
+import qualified Data.Text.IO as T
 import qualified Hledger.Data as H
 import qualified Hledger.Query as H
 import qualified Hledger.Read as H

bin/hledger-combine-balances.hs

@@ -11,7 +11,7 @@ import System.Environment (getArgs)
 import Hledger.Cli
 import qualified Data.Map as M
 import Data.Map.Merge.Strict
-import qualified Data.Text.Lazy.IO as TL (putStrLn)  -- Only putStr and friends are safe
+import qualified Data.Text.Lazy.IO as TL
 
 appendReports :: MultiBalanceReport -> MultiBalanceReport -> MultiBalanceReport
 appendReports r1 r2 =

bin/hledger-swap-dates.hs

@@ -9,7 +9,7 @@
 {-# LANGUAGE RecordWildCards #-}
 
 import Data.String.QQ (s)
-import qualified Data.Text.IO as T (putStrLn)  -- Only putStr and friends are safe
+import qualified Data.Text.IO as T
 import Hledger
 import Hledger.Cli
 

examples/unicode-bom.journal

@@ -1,8 +0,0 @@
-; unicode in description, account name and currency symbol
-2010/1/1 ß
-  (ß)  10 ß
-
-; as above but with characters from code pages not installed on a western ms windows machine
-2010/1/1 проверка
-  (проверка)  10 проверка
-

hledger-lib/Hledger/Data/PeriodicTransaction.hs

@@ -12,7 +12,7 @@ module Hledger.Data.PeriodicTransaction (
 where
 
 import qualified Data.Text as T
-import qualified Data.Text.IO as TIO (putStr)  -- Only putStr and friends are safe
+import qualified Data.Text.IO as T
 import Text.Printf
 
 import Hledger.Data.Types
@@ -36,7 +36,7 @@ _ptgen str = do
   case checkPeriodicTransactionStartDate i s t of
     Just e  -> error' e  -- PARTIAL:
     Nothing ->
-      mapM_ (TIO.putStr . showTransaction) $
+      mapM_ (T.putStr . showTransaction) $
         runPeriodicTransaction
           nullperiodictransaction{ ptperiodexpr=t , ptspan=s, ptinterval=i, ptpostings=["a" `post` usd 1] }
           nulldatespan
@@ -48,7 +48,7 @@ _ptgenspan str span = do
   case checkPeriodicTransactionStartDate i s t of
     Just e  -> error' e  -- PARTIAL:
     Nothing ->
-      mapM_ (TIO.putStr . showTransaction) $
+      mapM_ (T.putStr . showTransaction) $
         runPeriodicTransaction
           nullperiodictransaction{ ptperiodexpr=t , ptspan=s, ptinterval=i, ptpostings=["a" `post` usd 1] }
           span

hledger-lib/Hledger/Data/TransactionModifier.hs

@@ -63,10 +63,10 @@ modifyTransactions atypes atags styles d tmods ts = do
 -- Currently the only kind of modification possible is adding automated
 -- postings when certain other postings are present.
 --
--- >>> import qualified Data.Text.IO as TIO (putStr)  -- Only putStr and friends are safe
+-- >>> import qualified Data.Text.IO as T
 -- >>> t = nulltransaction{tpostings=["ping" `post` usd 1]}
 -- >>> tmpost acc amt = TMPostingRule (acc `post` amt) False
--- >>> test = either putStr (TIO.putStr.showTransaction) . fmap ($ t) . transactionModifierToFunction (const Nothing) (const []) mempty nulldate
+-- >>> test = either putStr (T.putStr.showTransaction) . fmap ($ t) . transactionModifierToFunction (const Nothing) (const []) mempty nulldate
 -- >>> test $ TransactionModifier "" ["pong" `tmpost` usd 2]
 -- 0000-01-01
 --     ping           $1.00

hledger-lib/Hledger/Read.hs

@@ -63,7 +63,7 @@ import Data.Ord (comparing)
 import Data.Semigroup (sconcat)
 import Data.Text (Text)
 import qualified Data.Text as T
-import Data.Text.IO.Utf8 (writeFile)
+import qualified Data.Text.IO as T
 import Data.Time (Day)
 import Safe (headDef)
 import System.Directory (doesFileExist, getHomeDirectory)
@@ -230,7 +230,7 @@ ensureJournalFileExists f = do
     hPutStr stderr $ "Creating hledger journal file " <> show f <> ".\n"
     -- note Hledger.Utils.UTF8.* do no line ending conversion on windows,
     -- we currently require unix line endings on all platforms.
-    newJournalContent >>= writeFile f
+    newJournalContent >>= T.writeFile f
 
 -- | Does any part of this path contain non-. characters and end with a . ?
 -- Such paths are not safe to use on Windows (cf #1056).
@@ -257,7 +257,7 @@ latestDates = headDef [] . take 1 . group . reverse . sort
 -- | Remember that these transaction dates were the latest seen when
 -- reading this journal file.
 saveLatestDates :: LatestDates -> FilePath -> IO ()
-saveLatestDates dates f = writeFile (latestDatesFileFor f) $ T.unlines $ map showDate dates
+saveLatestDates dates f = T.writeFile (latestDatesFileFor f) $ T.unlines $ map showDate dates
 
 -- | What were the latest transaction dates seen the last time this
 -- journal file was read ? If there were multiple transactions on the

hledger-lib/Hledger/Read/CsvReader.hs

@@ -37,7 +37,6 @@ module Hledger.Read.CsvReader (
 where
 
 --- ** imports
-import Prelude hiding (getContents, writeFile)
 import Control.Applicative        (liftA2)
 import Control.Monad              (unless, when)
 import Control.Monad.Except       (ExceptT(..), liftEither, throwError)
@@ -45,14 +44,9 @@ import qualified Control.Monad.Fail as Fail
 import Control.Monad.IO.Class     (MonadIO, liftIO)
 import Control.Monad.State.Strict (StateT, get, modify', evalStateT)
 import Control.Monad.Trans.Class  (lift)
+import Data.Char                  (toLower, isDigit, isSpace, isAlphaNum, ord)
 import Data.Bifunctor             (first)
 import Data.Functor               ((<&>))
-import qualified Data.ByteString as B
-import qualified Data.ByteString.Lazy as BL
-import Data.Char (toLower, isDigit, isSpace, isAlphaNum, ord)
-import qualified Data.Csv as Cassava
-import qualified Data.Csv.Parser.Megaparsec as CassavaMP
-import Data.Foldable (asum, toList)
 import Data.List (elemIndex, foldl', intersperse, mapAccumL, nub, sortBy)
 import Data.Maybe (catMaybes, fromMaybe, isJust)
 import Data.MemoUgly (memo)
@@ -60,9 +54,8 @@ import Data.Ord (comparing)
 import qualified Data.Set as S
 import Data.Text (Text)
 import qualified Data.Text as T
-import Data.Text.Encoding (decodeUtf8, encodeUtf8)
-import Data.Text.IO (getContents)  -- Only putStr and friends are safe
-import Data.Text.IO.Utf8 (writeFile)
+import qualified Data.Text.Encoding as T
+import qualified Data.Text.IO as T
 import qualified Data.Text.Lazy as TL
 import qualified Data.Text.Lazy.Builder as TB
 import Data.Time.Calendar (Day)
@@ -70,6 +63,11 @@ import Data.Time.Format (parseTimeM, defaultTimeLocale)
 import Safe (atMay, headMay, lastMay, readMay)
 import System.Directory (doesFileExist)
 import System.FilePath ((</>), takeDirectory, takeExtension, takeFileName)
+import qualified Data.Csv as Cassava
+import qualified Data.Csv.Parser.Megaparsec as CassavaMP
+import qualified Data.ByteString as B
+import qualified Data.ByteString.Lazy as BL
+import Data.Foldable (asum, toList)
 import Text.Megaparsec hiding (match, parse)
 import Text.Megaparsec.Char (char, newline, string)
 import Text.Megaparsec.Custom (customErrorBundlePretty, parseErrorAt)
@@ -199,7 +197,7 @@ expandIncludes dir content = mapM (expandLine dir) (T.lines content) >>= return
   where
     expandLine dir line =
       case line of
-        (T.stripPrefix "include " -> Just f) -> expandIncludes dir' =<< readFilePortably f'
+        (T.stripPrefix "include " -> Just f) -> expandIncludes dir' =<< T.readFile f'
           where
             f' = dir </> T.unpack (T.dropWhile isSpace f)
             dir' = takeDirectory f'
@@ -747,8 +745,8 @@ readJournalFromCsv mrulesfile csvfile csvdata = do
       -- than one date and the first date is more recent than the last):
       -- reverse them to get same-date transactions ordered chronologically.
       txns' =
-        (if newestfirst || mdataseemsnewestfirst == Just True
-          then dbg7 "reversed csv txns" . reverse else id)
+        (if newestfirst || mdataseemsnewestfirst == Just True 
+          then dbg7 "reversed csv txns" . reverse else id) 
           txns
         where
           newestfirst = dbg6 "newestfirst" $ isJust $ getDirective "newest-first" rules
@@ -761,7 +759,7 @@ readJournalFromCsv mrulesfile csvfile csvdata = do
 
     liftIO $ when (not rulesfileexists) $ do
       dbg1IO "creating conversion rules file" rulesfile
-      writeFile rulesfile rulestext
+      T.writeFile rulesfile rulestext
 
     return nulljournal{jtxns=txns''}
 
@@ -776,14 +774,14 @@ parseSeparator = specials . T.toLower
 parseCsv :: Char -> FilePath -> Text -> ExceptT String IO CSV
 parseCsv separator filePath csvdata = ExceptT $
   case filePath of
-    "-" -> parseCassava separator "(stdin)" <$> getContents
+    "-" -> parseCassava separator "(stdin)" <$> T.getContents
     _   -> return $ if T.null csvdata then Right mempty else parseCassava separator filePath csvdata
 
 parseCassava :: Char -> FilePath -> Text -> Either String CSV
 parseCassava separator path content =
   either (Left . errorBundlePretty) (Right . parseResultToCsv) <$>
   CassavaMP.decodeWith (decodeOptions separator) Cassava.NoHeader path $
-  BL.fromStrict $ encodeUtf8 content
+  BL.fromStrict $ T.encodeUtf8 content
 
 decodeOptions :: Char -> Cassava.DecodeOptions
 decodeOptions separator = Cassava.defaultDecodeOptions {
@@ -794,7 +792,7 @@ parseResultToCsv :: (Foldable t, Functor t) => t (t B.ByteString) -> CSV
 parseResultToCsv = toListList . unpackFields
     where
         toListList = toList . fmap toList
-        unpackFields  = (fmap . fmap) decodeUtf8
+        unpackFields  = (fmap . fmap) T.decodeUtf8
 
 printCSV :: CSV -> TL.Text
 printCSV = TB.toLazyText . unlinesB . map printRecord

hledger-lib/Hledger/Utils.hs

@@ -36,7 +36,7 @@ import Data.FileEmbed (makeRelativeToProject, embedStringFile)
 import Data.List.Extra (foldl', foldl1', uncons, unsnoc)
 import qualified Data.Set as Set
 import Data.Text (Text)
-import qualified Data.Text.IO as TIO (hGetContents)  -- Only putStr and friends are safe
+import qualified Data.Text.IO as T
 import qualified Data.Text.Lazy.Builder as TB
 import Data.Time.Clock (getCurrentTime)
 import Data.Time.LocalTime (LocalTime, ZonedTime, getCurrentTimeZone,
@@ -48,10 +48,10 @@ import Lens.Micro ((&), (.~))
 import Lens.Micro.TH (DefName(TopName), lensClass, lensField, makeLensesWith, classyRules)
 import System.Console.ANSI (Color,ColorIntensity,ConsoleLayer(..), SGR(..), setSGRCode)
 import System.Directory (getHomeDirectory)
-import System.FilePath ((</>), isRelative)
-import System.IO (Handle, IOMode (..), hGetEncoding, hSetEncoding,
-                  hSetNewlineMode, stdin, universalNewlineMode, utf8_bom)
-import qualified System.IO.Utf8 as Utf8
+import System.FilePath (isRelative, (</>))
+import System.IO
+  (Handle, IOMode (..), hGetEncoding, hSetEncoding, hSetNewlineMode,
+   openFile, stdin, universalNewlineMode, utf8_bom)
 
 import Hledger.Utils.Debug
 import Hledger.Utils.Parse
@@ -175,7 +175,7 @@ expandHomePath = \case
 -- using the system locale's text encoding,
 -- ignoring any utf8 BOM prefix (as seen in paypal's 2018 CSV, eg) if that encoding is utf8.
 readFilePortably :: FilePath -> IO Text
-readFilePortably f =  Utf8.openFile f ReadMode >>= readHandlePortably
+readFilePortably f =  openFile f ReadMode >>= readHandlePortably
 
 -- | Like readFilePortably, but read from standard input if the path is "-".
 readFileOrStdinPortably :: String -> IO Text
@@ -183,14 +183,15 @@ readFileOrStdinPortably f = openFileOrStdin f ReadMode >>= readHandlePortably
   where
     openFileOrStdin :: String -> IOMode -> IO Handle
     openFileOrStdin "-" _ = return stdin
-    openFileOrStdin f m   = Utf8.openFile f m
+    openFileOrStdin f m   = openFile f m
 
 readHandlePortably :: Handle -> IO Text
 readHandlePortably h = do
-    hSetNewlineMode h universalNewlineMode
-    menc <- hGetEncoding h
-    when (fmap show menc == Just "UTF-8") $ hSetEncoding h utf8_bom  -- No Eq instance, rely on Show
-    TIO.hGetContents h
+  hSetNewlineMode h universalNewlineMode
+  menc <- hGetEncoding h
+  when (fmap show menc == Just "UTF-8") $  -- XXX no Eq instance, rely on Show
+    hSetEncoding h utf8_bom
+  T.hGetContents h
 
 -- | Total version of maximum, for integral types, giving 0 for an empty list.
 maximum' :: Integral a => [a] -> a

hledger-lib/hledger-lib.cabal

@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.7.
+-- This file has been generated from package.yaml by hpack version 0.34.4.
 --
 -- see: https://github.com/sol/hpack
 
@@ -137,7 +137,6 @@ library
     , uglymemo
     , unordered-containers >=0.2
     , utf8-string >=0.3.5
-    , with-utf8 >=1.0.0
   default-language: Haskell2010
 
 test-suite doctest
@@ -189,7 +188,6 @@ test-suite doctest
     , uglymemo
     , unordered-containers >=0.2
     , utf8-string >=0.3.5
-    , with-utf8 >=1.0.0
   if impl(ghc < 9.2)
     buildable: False
   default-language: Haskell2010
@@ -243,6 +241,5 @@ test-suite unittest
     , uglymemo
     , unordered-containers >=0.2
     , utf8-string >=0.3.5
-    , with-utf8 >=1.0.0
   buildable: True
   default-language: Haskell2010

hledger-lib/package.yaml

@@ -48,10 +48,8 @@ dependencies:
 - Decimal >=0.5.1
 - directory
 - doclayout >=0.3 && <0.4
-- extra >=1.6.3
 - file-embed >=0.0.10
 - filepath
-- Glob >= 0.9
 - hashtables >=1.2.3.1
 - megaparsec >=7.0.0 && <9.3
 - microlens >=0.4
@@ -72,7 +70,8 @@ dependencies:
 - unordered-containers >=0.2
 - uglymemo
 - utf8-string >=0.3.5
-- with-utf8 >=1.0.0
+- extra >=1.6.3
+- Glob >= 0.9
 # for ledger-parse:
 #- parsers >=0.5
 #- system-filepath

hledger/Hledger/Cli/Commands/Accounts.hs

@@ -22,7 +22,7 @@ module Hledger.Cli.Commands.Accounts (
 
 import Data.List
 import qualified Data.Text as T
-import qualified Data.Text.IO as TIO (putStrLn)  -- Only putStr and friends are safe
+import qualified Data.Text.IO as T
 import System.Console.CmdArgs.Explicit as C
 
 import Hledger
@@ -96,4 +96,4 @@ accounts CliOpts{rawopts_=rawopts, reportspec_=ReportSpec{_rsQuery=query,_rsRepo
       where
         spacer = T.replicate (maxwidth - T.length (showName a)) " "
     maxwidth = maximum $ map (T.length . showName) clippedaccts
-  forM_ clippedaccts $ \a -> TIO.putStrLn $ showName a <> showType a
+  forM_ clippedaccts $ \a -> T.putStrLn $ showName a <> showType a

hledger/Hledger/Cli/Commands/Add.hs

@@ -26,9 +26,9 @@ import Data.List (isPrefixOf)
 import Data.Maybe (fromJust, fromMaybe, isJust)
 import Data.Text (Text)
 import qualified Data.Text as T
-import qualified Data.Text.IO as TIO (hPutStr, putStr)  -- Only putStr and friends are safe
+import qualified Data.Text.IO as T
 import qualified Data.Text.Lazy as TL
-import qualified Data.Text.Lazy.IO as TLIO (putStrLn)   -- Only putStr and friends are safe
+import qualified Data.Text.Lazy.IO as TL
 import Data.Time.Calendar (Day)
 import Data.Time.Format (formatTime, defaultTimeLocale)
 import Lens.Micro ((^.))
@@ -184,7 +184,7 @@ confirmedTransactionWizard prevInput es@EntryState{..} stack@(currentStage : _)
           prevInput' = prevInput{prevDescAndCmnt=Just descAndCommentString}
       when (isJust mbaset) . liftIO $ do
           hPutStrLn stderr "Using this similar transaction for defaults:"
-          TIO.hPutStr stderr $ showTransaction (fromJust mbaset)
+          T.hPutStr stderr $ showTransaction (fromJust mbaset)
       confirmedTransactionWizard prevInput' es' ((EnterNewPosting TxnParams{txnDate=date, txnCode=code, txnDesc=desc, txnCmnt=comment} Nothing) : stack)
     Nothing ->
       confirmedTransactionWizard prevInput es (drop 1 stack)
@@ -435,7 +435,7 @@ journalAddTransaction j@Journal{jtxns=ts} opts t = do
     -- unelided shows all amounts explicitly, in case there's a price, cf #283
   when (debug_ opts > 0) $ do
     putStrLn $ printf "\nAdded transaction to %s:" f
-    TLIO.putStrLn =<< registerFromString (showTransaction t)
+    TL.putStrLn =<< registerFromString (showTransaction t)
   return j{jtxns=ts++[t]}
 
 -- | Append a string, typically one or more transactions, to a journal
@@ -448,7 +448,7 @@ journalAddTransaction j@Journal{jtxns=ts} opts t = do
 --
 appendToJournalFileOrStdout :: FilePath -> Text -> IO ()
 appendToJournalFileOrStdout f s
-  | f == "-"  = TIO.putStr s'
+  | f == "-"  = T.putStr s'
   | otherwise = appendFile f $ T.unpack s'
   where s' = "\n" <> ensureOneNewlineTerminated s
 

hledger/Hledger/Cli/Commands/Checkdates.hs

@@ -7,7 +7,7 @@ module Hledger.Cli.Commands.Checkdates (
 ) where
 
 import qualified Data.Text as T
-import qualified Data.Text.IO as TIO (putStrLn)  -- Only putStr and friends are safe
+import qualified Data.Text.IO as T
 import Hledger
 import Hledger.Cli.CliOptions
 import System.Console.CmdArgs.Explicit
@@ -43,7 +43,7 @@ checkdates CliOpts{rawopts_=rawopts,reportspec_=rspec} j = do
         positionstr = T.pack . showGenericSourcePos $ tsourcepos error
         txn1str = linesPrepend  (T.pack "  ")               $ showTransaction previous
         txn2str = linesPrepend2 (T.pack "> ") (T.pack "  ") $ showTransaction error
-      TIO.putStrLn $
+      T.putStrLn $
         T.pack "Error: transaction date is out of order"
         <> uniquestr <> T.pack "\nat " <> positionstr <> T.pack ":\n\n"
         <> txn1str <> txn2str

hledger/Hledger/Cli/Commands/Close.hs

@@ -12,7 +12,7 @@ import Data.Function (on)
 import Data.List (groupBy)
 import Data.Maybe (fromMaybe)
 import qualified Data.Text as T
-import qualified Data.Text.IO as TIO (putStr)  -- Only putStr and friends are safe
+import qualified Data.Text.IO as T
 import Data.Time.Calendar (addDays)
 import System.Console.CmdArgs.Explicit as C
 
@@ -169,5 +169,5 @@ close CliOpts{rawopts_=rawopts, reportspec_=rspec'} j = do
       ++ [posting{paccount=openingacct, pamount=if explicit then mixedAmountSetFullPrecision (maNegate totalamt) else missingmixedamt} | not interleaved]
 
   -- print them
-  when closing . TIO.putStr $ showTransaction closingtxn
-  when opening . TIO.putStr $ showTransaction openingtxn
+  when closing . T.putStr $ showTransaction closingtxn
+  when opening . T.putStr $ showTransaction openingtxn

hledger/Hledger/Cli/Commands/Codes.hs

@@ -16,7 +16,7 @@ module Hledger.Cli.Commands.Codes (
 ) where
 
 import qualified Data.Text as T
-import qualified Data.Text.IO as TIO (putStrLn)  -- Only putStr and friends are safe
+import qualified Data.Text.IO as T
 
 import Hledger
 import Hledger.Cli.CliOptions
@@ -36,4 +36,4 @@ codes CliOpts{reportspec_=rspec} j = do
   let ts = entriesReport rspec j
       codes = (if empty_ (_rsReportOpts rspec) then id else filter (not . T.null)) $
               map tcode ts
-  mapM_ TIO.putStrLn codes
+  mapM_ T.putStrLn codes

hledger/Hledger/Cli/Commands/Commodities.hs

@@ -13,7 +13,7 @@ module Hledger.Cli.Commands.Commodities (
 ) where
 
 import qualified Data.Set as S
-import qualified Data.Text.IO as TIO (putStrLn)  -- Only putStr and friends are safe
+import qualified Data.Text.IO as T
 
 import Hledger
 import Hledger.Cli.CliOptions
@@ -30,4 +30,4 @@ commoditiesmode = hledgerCommandMode
 commodities :: CliOpts -> Journal -> IO ()
 commodities _copts =
   -- TODO support --declared/--used like accounts, payees
-  mapM_ TIO.putStrLn . S.filter (/= "AUTO") . journalCommodities
+  mapM_ T.putStrLn . S.filter (/= "AUTO") . journalCommodities

hledger/Hledger/Cli/Commands/Descriptions.hs

@@ -15,7 +15,7 @@ module Hledger.Cli.Commands.Descriptions (
 ) where
 
 import Data.List.Extra (nubSort)
-import qualified Data.Text.IO as TIO (putStrLn)  -- Only putStr and friends are safe
+import qualified Data.Text.IO as T
 
 import Hledger
 import Hledger.Cli.CliOptions
@@ -35,4 +35,4 @@ descriptions CliOpts{reportspec_=rspec} j = do
   let ts = entriesReport rspec j
       descriptions = nubSort $ map tdescription ts
 
-  mapM_ TIO.putStrLn descriptions
+  mapM_ T.putStrLn descriptions

hledger/Hledger/Cli/Commands/Diff.hs

@@ -18,7 +18,7 @@ import Data.Ord (comparing)
 import Data.Maybe (fromJust)
 import Data.Time (diffDays)
 import Data.Either (partitionEithers)
-import qualified Data.Text.IO as TIO (putStr)  -- Only putStr and friends are safe
+import qualified Data.Text.IO as T
 import Lens.Micro (set)
 import System.Exit (exitFailure)
 
@@ -108,10 +108,10 @@ diff CliOpts{file_=[f1, f2], reportspec_=ReportSpec{_rsQuery=Acct acctRe}} _ = d
   let unmatchedtxn2 = unmatchedtxns R pp2 m
 
   putStrLn "These transactions are in the first file only:\n"
-  mapM_ (TIO.putStr . showTransaction) unmatchedtxn1
+  mapM_ (T.putStr . showTransaction) unmatchedtxn1
 
   putStrLn "These transactions are in the second file only:\n"
-  mapM_ (TIO.putStr . showTransaction) unmatchedtxn2
+  mapM_ (T.putStr . showTransaction) unmatchedtxn2
 
 diff _ _ = do
   putStrLn "Please specify two input files. Usage: hledger diff -f FILE1 -f FILE2 FULLACCOUNTNAME"

hledger/Hledger/Cli/Commands/Import.hs

@@ -9,7 +9,7 @@ where
 
 import Control.Monad
 import Data.List
-import qualified Data.Text.IO as TIO (putStr)  -- Only putStr and friends are safe
+import qualified Data.Text.IO as T
 import Hledger
 import Hledger.Cli.CliOptions
 import Hledger.Cli.Commands.Add (journalAddTransaction)
@@ -60,7 +60,7 @@ importcmd opts@CliOpts{rawopts_=rawopts,inputopts_=iopts} j = do
               printf "; would import %d new transactions from %s:\n\n" (length newts) inputstr
               -- TODO how to force output here ?
               -- length (jtxns newj) `seq` print' opts{rawopts_=("explicit",""):rawopts} newj
-              mapM_ (TIO.putStr . showTransaction) newts
+              mapM_ (T.putStr . showTransaction) newts
             newts | catchup -> do
               printf "marked %s as caught up, skipping %d unimported transactions\n\n" inputstr (length newts)
             newts -> do

hledger/Hledger/Cli/Commands/Notes.hs

@@ -16,7 +16,7 @@ module Hledger.Cli.Commands.Notes (
 ) where
 
 import Data.List.Extra (nubSort)
-import qualified Data.Text.IO as TIO (putStrLn)  -- Only putStr and friends are safe
+import qualified Data.Text.IO as T
 
 import Hledger
 import Hledger.Cli.CliOptions
@@ -35,4 +35,4 @@ notes :: CliOpts -> Journal -> IO ()
 notes CliOpts{reportspec_=rspec} j = do
   let ts = entriesReport rspec j
       notes = nubSort $ map transactionNote ts
-  mapM_ TIO.putStrLn notes
+  mapM_ T.putStrLn notes

hledger/Hledger/Cli/Commands/Payees.hs

@@ -15,7 +15,7 @@ module Hledger.Cli.Commands.Payees (
 ) where
 
 import qualified Data.Set as S
-import qualified Data.Text.IO as TIO (putStrLn)  -- Only putStr and friends are safe
+import qualified Data.Text.IO as T
 import System.Console.CmdArgs.Explicit as C
 
 import Hledger
@@ -45,4 +45,4 @@ payees CliOpts{rawopts_=rawopts, reportspec_=ReportSpec{_rsQuery=query}} j = do
       if | declared     && not used -> matcheddeclaredpayees
          | not declared && used     -> matchedusedpayees
          | otherwise                -> matcheddeclaredpayees <> matchedusedpayees
-  mapM_ TIO.putStrLn payees
+  mapM_ T.putStrLn payees

hledger/Hledger/Cli/Commands/Prices.hs

@@ -10,7 +10,7 @@ where
 import qualified Data.Map as M
 import Data.List
 import qualified Data.Text as T
-import qualified Data.Text.IO as TIO (putStrLn)  -- Only putStr and friends are safe
+import qualified Data.Text.IO as T
 import Hledger
 import Hledger.Cli.CliOptions
 import System.Console.CmdArgs.Explicit
@@ -45,7 +45,7 @@ prices opts j = do
       ++ ifBoolOpt "infer-market-prices" cprices
       ++ ifBoolOpt "infer-reverse-prices" rcprices  -- TODO: shouldn't this show reversed P prices also ? valuation will use them
 
-  mapM_ (TIO.putStrLn . showPriceDirective) $
+  mapM_ (T.putStrLn . showPriceDirective) $
     sortOn pddate $
     filter (matchesPriceDirective q) $
     allprices

hledger/Hledger/Cli/Commands/Print.hs

@@ -18,7 +18,7 @@ where
 import Data.Text (Text)
 import Data.List (intersperse)
 import qualified Data.Text as T
-import qualified Data.Text.IO as TIO (putStr, putStrLn)  -- Only putStr and friends are safe
+import qualified Data.Text.IO as T
 import qualified Data.Text.Lazy as TL
 import qualified Data.Text.Lazy.Builder as TB
 import Lens.Micro ((^.), _Just, has)
@@ -206,5 +206,5 @@ postingToCSV p =
 printMatch :: CliOpts -> Journal -> Text -> IO ()
 printMatch opts j desc = do
   case journalSimilarTransaction opts j desc of
-    Nothing -> TIO.putStrLn "no matches found."
-    Just t  -> TIO.putStr $ showTransaction t
+    Nothing -> putStrLn "no matches found."
+    Just t  -> T.putStr $ showTransaction t

hledger/Hledger/Cli/Commands/Registermatch.hs

@@ -10,7 +10,7 @@ where
 import Data.Char (toUpper)
 import Data.List
 import qualified Data.Text as T
-import qualified Data.Text.Lazy.IO as TLIO (putStr, putStrLn)  -- Only putStr and friends are safe
+import qualified Data.Text.Lazy.IO as TL
 import Hledger
 import Hledger.Cli.CliOptions
 import Hledger.Cli.Commands.Register
@@ -28,8 +28,8 @@ registermatch opts@CliOpts{rawopts_=rawopts,reportspec_=rspec} j =
     [desc] -> do
         let ps = [p | (_,_,_,p,_) <- postingsReport rspec j]
         case similarPosting ps desc of
-          Nothing -> TLIO.putStrLn "no matches found."
-          Just p  -> TLIO.putStr $ postingsReportAsText opts [pri]
+          Nothing -> putStrLn "no matches found."
+          Just p  -> TL.putStr $ postingsReportAsText opts [pri]
                      where pri = (Just (postingDate p)
                                  ,Nothing
                                  ,tdescription <$> ptransaction p

hledger/Hledger/Cli/Commands/Rewrite.hs

@@ -14,7 +14,7 @@ import Data.Functor.Identity
 import Data.List (sortOn, foldl')
 import Data.Text (Text)
 import qualified Data.Text as T
-import qualified Data.Text.IO as TIO (putStr)  -- Only putStr and friends are safe
+import qualified Data.Text.IO as T
 import Hledger
 import Hledger.Cli.CliOptions
 import Hledger.Cli.Commands.Print
@@ -66,7 +66,7 @@ printOrDiff opts
 diffOutput :: Journal -> Journal -> IO ()
 diffOutput j j' = do
     let changed = [(originalTransaction t, originalTransaction t') | (t, t') <- zip (jtxns j) (jtxns j'), t /= t']
-    TIO.putStr $ renderPatch $ map (uncurry $ diffTxn j) changed
+    T.putStr $ renderPatch $ map (uncurry $ diffTxn j) changed
 
 type Chunk = (SourcePos, [DiffLine Text])
 

hledger/Hledger/Cli/Commands/Roi.hs

@@ -25,7 +25,7 @@ import Data.List
 import Numeric.RootFinding
 import Data.Decimal
 import qualified Data.Text as T
-import qualified Data.Text.Lazy.IO as TLIO (putStr, putStrLn)  -- Only putStr and friends are safe
+import qualified Data.Text.Lazy.IO as TL
 import System.Console.CmdArgs.Explicit as CmdArgs
 
 import Text.Tabular.AsciiWide as Tab
@@ -85,7 +85,7 @@ roi CliOpts{rawopts_=rawopts, reportspec_=rspec@ReportSpec{_rsReportOpts=ReportO
     trans = dbg3 "investments" $ jtxns filteredj
 
   when (null trans) $ do
-    TLIO.putStrLn "No relevant transactions found. Check your investments query"
+    putStrLn "No relevant transactions found. Check your investments query"
     exitFailure
 
   let spans = snd $ reportSpan filteredj rspec
@@ -146,7 +146,7 @@ roi CliOpts{rawopts_=rawopts, reportspec_=rspec@ReportSpec{_rsReportOpts=ReportO
                , Tab.Group Tab.SingleLine [Header "IRR", Header "TWR"]])
               tableBody
 
-  TLIO.putStrLn $ Tab.render prettyTables id id id table
+  TL.putStrLn $ Tab.render prettyTables id id id table
 
 timeWeightedReturn showCashFlow prettyTables investmentsQuery trans mixedAmountValue (OneSpan spanBegin spanEnd valueBeforeAmt valueAfter cashFlow pnl) = do
   let valueBefore = unMix valueBeforeAmt
@@ -229,7 +229,7 @@ timeWeightedReturn showCashFlow prettyTables investmentsQuery trans mixedAmountV
         unitPrices = add initialUnitPrice unitPrices'
         unitBalances = add initialUnits unitBalances'
 
-    TLIO.putStr $ Tab.render prettyTables id id T.pack
+    TL.putStr $ Tab.render prettyTables id id T.pack
       (Table
        (Tab.Group NoLine (map (Header . showDate) dates))
        (Tab.Group DoubleLine [ Tab.Group Tab.SingleLine [Tab.Header "Portfolio value", Tab.Header "Unit balance"]
@@ -259,7 +259,7 @@ internalRateOfReturn showCashFlow prettyTables (OneSpan spanBegin spanEnd valueB
   when showCashFlow $ do
     printf "\nIRR cash flow for %s - %s\n" (showDate spanBegin) (showDate (addDays (-1) spanEnd))
     let (dates, amounts) = unzip totalCF
-    TLIO.putStrLn $ Tab.render prettyTables id id id
+    TL.putStrLn $ Tab.render prettyTables id id id
       (Table
        (Tab.Group Tab.NoLine (map (Header . showDate) dates))
        (Tab.Group Tab.SingleLine [Header "Amount"])

hledger/Hledger/Cli/Commands/Tags.hs

@@ -10,7 +10,7 @@ where
 import qualified Control.Monad.Fail as Fail
 import Data.List.Extra (nubSort)
 import qualified Data.Text as T
-import qualified Data.Text.IO as TIO (putStrLn)  -- Only putStr and friends are safe
+import qualified Data.Text.IO as T
 import Safe
 import System.Console.CmdArgs.Explicit as C
 import Hledger
@@ -55,4 +55,4 @@ tags CliOpts{rawopts_=rawopts,reportspec_=rspec} j = do
       , let r = if values then v else t
       , not (values && T.null v && not empty)
       ]
-  mapM_ TIO.putStrLn tagsorvalues
+  mapM_ T.putStrLn tagsorvalues

hledger/Hledger/Cli/Main.hs

@@ -41,18 +41,17 @@ etc.
 module Hledger.Cli.Main where
 
 import Data.Char (isDigit)
-import Data.List (isPrefixOf)
-import Data.Time.Clock.POSIX (getPOSIXTime)
-import Main.Utf8 (withUtf8)
-import Safe (headDef, headMay)
+import Data.List
+import Safe
 import qualified System.Console.CmdArgs.Explicit as C
-import System.Environment (getArgs)
-import System.Exit (exitFailure, exitWith)
-import System.FilePath (dropExtension)
-import System.Process (system)
-import Text.Printf (printf)
+import System.Environment
+import System.Exit
+import System.FilePath
+import System.Process
+import Text.Printf
 
 import Hledger.Cli
+import Data.Time.Clock.POSIX (getPOSIXTime)
 
 
 -- | The overall cmdargs mode describing hledger's command-line options and subcommands.
@@ -97,7 +96,7 @@ mainmode addons = defMode {
 
 -- | Let's go!
 main :: IO ()
-main = withUtf8 $ do
+main = do
   progstarttime <- getPOSIXTime
 
   -- Choose and run the appropriate internal or external command based

hledger/Hledger/Cli/Utils.hs

@@ -30,19 +30,16 @@ module Hledger.Cli.Utils
     )
 where
 
-import Prelude hiding (putStr, putStrLn, writeFile)
-
 import Control.Exception as C
 import Control.Monad.Except (ExceptT, liftIO)
+
 import Data.List
 import Data.Maybe
 import qualified Data.Text as T
+import qualified Data.Text.IO as T
 import qualified Data.Text.Lazy as TL
 import qualified Data.Text.Lazy.Builder as TB
-import qualified Data.Text.IO as TIO (putStrLn)      -- Only putStr and friends are safe
-import qualified Data.Text.IO.Utf8 as TIO
-import qualified Data.Text.Lazy.IO as TLIO (putStr)  -- Only putStr and friends are safe
-import qualified Data.Text.Lazy.IO.Utf8 as TLIO
+import qualified Data.Text.Lazy.IO as TL
 import Data.Time (Day)
 import Data.Time.Clock.POSIX (POSIXTime, utcTimeToPOSIXSeconds)
 import Lens.Micro ((^.))
@@ -114,7 +111,9 @@ anonymiseByOpts opts =
 -- | Write some output to stdout or to a file selected by --output-file.
 -- If the file exists it will be overwritten.
 writeOutput :: CliOpts -> String -> IO ()
-writeOutput opts = writeOutputLazyText opts . TL.pack
+writeOutput opts s = do
+  f <- outputFileFromOpts opts
+  (maybe putStr writeFile f) s
 
 -- | Write some output to stdout or to a file selected by --output-file.
 -- If the file exists it will be overwritten. This function operates on Lazy
@@ -122,7 +121,7 @@ writeOutput opts = writeOutputLazyText opts . TL.pack
 writeOutputLazyText :: CliOpts -> TL.Text -> IO ()
 writeOutputLazyText opts s = do
   f <- outputFileFromOpts opts
-  (maybe TLIO.putStr TLIO.writeFile f) s
+  (maybe TL.putStr TL.writeFile f) s
 
 -- -- | Get a journal from the given string and options, or throw an error.
 -- readJournal :: CliOpts -> String -> IO Journal
@@ -190,8 +189,8 @@ openBrowserOn u = trybrowsers browsers u
           ExitSuccess -> return ExitSuccess
           ExitFailure _ -> trybrowsers bs u
       trybrowsers [] u = do
-        TIO.putStrLn . T.pack $ "Could not start a web browser (tried: " <> intercalate ", " browsers <> ")"
-        TIO.putStrLn . T.pack $ "Please open your browser and visit " <> u
+        putStrLn $ printf "Could not start a web browser (tried: %s)" $ intercalate ", " browsers
+        putStrLn $ printf "Please open your browser and visit %s" u
         return $ ExitFailure 127
       browsers | os=="darwin"  = ["open"]
                | os=="mingw32" = ["c:/Program Files/Mozilla Firefox/firefox.exe"]
@@ -218,12 +217,12 @@ writeFileWithBackupIfChanged :: FilePath -> T.Text -> IO Bool
 writeFileWithBackupIfChanged f t = do
   s <- readFilePortably f
   if t == s then return False
-            else backUpFile f >> TIO.writeFile f t >> return True
+            else backUpFile f >> T.writeFile f t >> return True
 
 -- | Back up this file with a (incrementing) numbered suffix, then
 -- overwrite it with this new text, or give an error.
 writeFileWithBackup :: FilePath -> String -> IO ()
-writeFileWithBackup f t = backUpFile f >> TIO.writeFile f (T.pack t)
+writeFileWithBackup f t = backUpFile f >> writeFile f t
 
 readFileStrictly :: FilePath -> IO T.Text
 readFileStrictly f = readFilePortably f >>= \s -> C.evaluate (T.length s) >> return s

hledger/hledger.cabal

@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.6.
+-- This file has been generated from package.yaml by hpack version 0.34.4.
 --
 -- see: https://github.com/sol/hpack
 
@@ -172,7 +172,6 @@ library
     , unordered-containers
     , utf8-string >=0.3.5
     , utility-ht >=0.0.13
-    , with-utf8 >=1.0.0
     , wizards >=1.0
   if (!(os(windows))) && (flag(terminfo))
     build-depends:
@@ -222,7 +221,6 @@ executable hledger
     , unordered-containers
     , utf8-string >=0.3.5
     , utility-ht >=0.0.13
-    , with-utf8 >=1.0.0
     , wizards >=1.0
   if (!(os(windows))) && (flag(terminfo))
     build-depends:
@@ -273,7 +271,6 @@ test-suite unittest
     , unordered-containers
     , utf8-string >=0.3.5
     , utility-ht >=0.0.13
-    , with-utf8 >=1.0.0
     , wizards >=1.0
   if (!(os(windows))) && (flag(terminfo))
     build-depends:
@@ -323,7 +320,6 @@ benchmark bench
     , unordered-containers
     , utf8-string >=0.3.5
     , utility-ht >=0.0.13
-    , with-utf8 >=1.0.0
     , wizards >=1.0
   buildable: False
   if (!(os(windows))) && (flag(terminfo))

hledger/package.yaml

@@ -130,7 +130,6 @@ dependencies:
 - unordered-containers
 - utf8-string >=0.3.5
 - utility-ht >=0.0.13
-- with-utf8 >=1.0.0
 - wizards >=1.0
 
 when:

hledger/test/i18n/unicode-balance.test

@@ -1,17 +1,11 @@
-# 1. Works with unicode input.
-$hledger -f unicode.journal balance
-                10 ß  ß
-         10 проверка  проверка
+hledger -f - balance
+<<<
+2009-01-01 проверка
+  τράπεζα  10 руб
+  नकद
+>>>
+              10 руб  τράπεζα
+             -10 руб  नकद
 --------------------
-                10 ß
-         10 проверка  
->=0
-
-# 2. Handles a byte order mark.
-$ hledger -f unicode-bom.journal balance
-                10 ß  ß
-         10 проверка  проверка
---------------------
-                10 ß
-         10 проверка  
->=0
+                   0  
+>>>=0

hledger/test/i18n/unicode-bom.journal

@@ -1 +0,0 @@
-../../../examples/unicode-bom.journal

hledger/test/i18n/unicode.journal

@@ -1 +0,0 @@
-../../../examples/unicode.journal

stack8.6.yaml

@@ -15,6 +15,8 @@ packages:
 extra-deps:
 # for Shake.hs (regex doesn't support base-compat-0.11):
 - regex-1.0.2.0@rev:1
+- doclayout-0.3.1.1
+- emojis-0.1.2
 # for testing base-compat 0.11 compatibility (mutually exclusive with the above):
 # - aeson-1.4.6.0
 # - aeson-compat-0.3.9
@@ -27,11 +29,6 @@ extra-deps:
 - prettyprinter-1.7.0
 - prettyprinter-ansi-terminal-1.1.2
 - doctest-0.18.1
-- doclayout-0.3.1.1
-- emojis-0.1.2
-- with-utf8-1.0.2.3
-- th-compat-0.1.3
-- th-env-0.1.0.3
 # for hledger:
 - githash-0.1.4.0
 # for hledger-ui: