From 5c8e533ba91d4dc1244fa1db0c60fdd2302ea30c Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Mon, 6 Jun 2011 19:04:21 +0000
Subject: [PATCH] import cleanups

---
 hledger-web/Handlers.hs        | 1 -
 hledger-web/hledger-web.hs     | 4 +---
 hledger/Hledger/Cli.hs         | 2 ++
 hledger/Hledger/Cli/Convert.hs | 2 +-
 hledger/Hledger/Cli/Main.hs    | 1 -
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/hledger-web/Handlers.hs b/hledger-web/Handlers.hs
index f900ba593..d9d1e81f8 100644
--- a/hledger-web/Handlers.hs
+++ b/hledger-web/Handlers.hs
@@ -24,7 +24,6 @@ import Yesod.Form
 import Yesod.Json
 
 import Hledger.Cli
-import Hledger.Cli.Version -- XXX
 import Hledger.Data hiding (today)
 import Hledger.Read (journalFromPathAndString)
 import Hledger.Read.JournalReader (someamount)
diff --git a/hledger-web/hledger-web.hs b/hledger-web/hledger-web.hs
index 8c490208d..9a6bab0ef 100644
--- a/hledger-web/hledger-web.hs
+++ b/hledger-web/hledger-web.hs
@@ -22,9 +22,7 @@ import System.IO.Storage (withStore, putValue)
 import Text.Printf
 import Yesod.Helpers.Static
 
-import Hledger.Cli.Options
-import Hledger.Cli.Utils (withJournalDo) --, openBrowserOn)
-import Hledger.Cli.Version (progversionstr, binaryfilename)
+import Hledger.Cli
 import Hledger.Data
 import Prelude hiding (putStr, putStrLn)
 import Hledger.Utils.UTF8 (putStr, putStrLn)
diff --git a/hledger/Hledger/Cli.hs b/hledger/Hledger/Cli.hs
index a64944d55..a20ff6c5b 100644
--- a/hledger/Hledger/Cli.hs
+++ b/hledger/Hledger/Cli.hs
@@ -13,6 +13,7 @@ module Hledger.Cli (
                      module Hledger.Cli.Stats,
                      module Hledger.Cli.Options,
                      module Hledger.Cli.Utils,
+                     module Hledger.Cli.Version,
                      tests_Hledger_Cli
               )
 where
@@ -31,6 +32,7 @@ import Hledger.Cli.Register
 import Hledger.Cli.Stats
 import Hledger.Cli.Options
 import Hledger.Cli.Utils
+import Hledger.Cli.Version
 import Hledger.Data  -- including testing utils in Hledger.Data.Utils
 import Hledger.Read
 import Hledger.Read.JournalReader (someamount)
diff --git a/hledger/Hledger/Cli/Convert.hs b/hledger/Hledger/Cli/Convert.hs
index 2f6c82800..7256388af 100644
--- a/hledger/Hledger/Cli/Convert.hs
+++ b/hledger/Hledger/Cli/Convert.hs
@@ -20,8 +20,8 @@ import Text.CSV (parseCSV, parseCSVFromFile, printCSV, CSV)
 import Text.ParserCombinators.Parsec
 import Text.Printf (hPrintf)
 
+import Hledger.Cli.Version
 import Hledger.Cli.Options (Opt(Debug), progname_cli, rulesFileFromOpts)
-import Hledger.Cli.Version (progversionstr)
 import Hledger.Data.Amount (nullmixedamt, costOfMixedAmount)
 import Hledger.Data.Dates (firstJust, showDate, parsedate)
 import Hledger.Data (Journal,AccountName,Transaction(..),Posting(..),PostingType(..))
diff --git a/hledger/Hledger/Cli/Main.hs b/hledger/Hledger/Cli/Main.hs
index 060e939cb..f12773bf3 100644
--- a/hledger/Hledger/Cli/Main.hs
+++ b/hledger/Hledger/Cli/Main.hs
@@ -43,7 +43,6 @@ import Data.List
 
 import Hledger.Cli
 import Hledger.Cli.Tests
-import Hledger.Cli.Version (progversionstr, binaryfilename)
 import Prelude hiding (putStr, putStrLn)
 import Hledger.Utils (error')
 import Hledger.Utils.UTF8 (putStr, putStrLn)