[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36
John Goerzen
jgoerzen at complete.org
Fri Apr 23 15:17:42 UTC 2010
The following commit has been merged in the master branch:
commit a8d8e50c1170373c408b244bb050258cf88be13a
Author: John Goerzen <jgoerzen at complete.org>
Date: Sun Dec 3 09:54:23 2006 +0100
More renaming
diff --git a/COPYRIGHT b/COPYRIGHT
index 0fa7c22..75e140c 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -72,7 +72,7 @@ John Goerzen has made these modifications:
MissingH and have been removed.
----------------------------------------------------
-The MissingH.IO.BlockIO module is from blockio 2005-02-14 at
+The System.IO.BlockIO module is from blockio 2005-02-14 at
http://cryp.to/blockio/.
Copyright/License:
diff --git a/MissingH.cabal b/MissingH.cabal
index 90d0f57..cf5b0d3 100644
--- a/MissingH.cabal
+++ b/MissingH.cabal
@@ -5,10 +5,10 @@ License: GPL
Maintainer: John Goerzen <jgoerzen at complete.org>
Stability: Beta
Copyright: Copyright (c) 2004-2006 John Goerzen
-Exposed-Modules: MissingH.Str, MissingH.IO, MissingH.IO.Binary, MissingH.List,
+Exposed-Modules: MissingH.Str, MissingH.IO, System.IO.Binary, MissingH.List,
System.Daemon,
MissingH.Parsec,
- MissingH.HUnit,
+ Test.HUnit.Utils,
Network.Email.Mailbox,
MissingH.Logging, MissingH.Logging.Handler,
MissingH.Logging.Handler.Simple, MissingH.Logging.Handler.Syslog,
@@ -44,13 +44,13 @@ Exposed-Modules: MissingH.Str, MissingH.IO, MissingH.IO.Binary, MissingH.List,
Data.Compression.Inflate,
MissingH.FileArchive.GZip,
MissingH.Threads.Child, MissingH.Threads.Timeout,
- MissingH.IO.BlockIO,
- MissingH.IO.HVFS,
- MissingH.IO.HVFS.Combinators,
- MissingH.IO.HVFS.InstanceHelpers,
- MissingH.IO.HVFS.Utils,
- MissingH.IO.HVIO, MissingH.IO.StatCompat, MissingH.IO.WindowsCompat,
- MissingH.IO.PlafCompat, MissingH.IO.PosixConsts,
+ System.IO.BlockIO,
+ System.IO.HVFS,
+ System.IO.HVFS.Combinators,
+ System.IO.HVFS.InstanceHelpers,
+ System.IO.HVFS.Utils,
+ System.IO.HVIO, MissingH.IO.StatCompat, MissingH.IO.WindowsCompat,
+ System.IO.PlafCompat, System.IO.PosixConsts,
Network.Email.Parser,
System.Debian, System.Debian.ControlParser,
MissingH.MIMETypes,
diff --git a/MissingH/IO.hs b/MissingH/IO.hs
index 6958718..ac66f5e 100644
--- a/MissingH/IO.hs
+++ b/MissingH/IO.hs
@@ -49,7 +49,7 @@ module MissingH.IO(-- * Entire File Handle Utilities
import System.IO.Unsafe
import System.IO
import Data.List
-import MissingH.IO.HVIO
+import System.IO.HVIO
{- | Given a list of strings, output a line containing each item, adding
newlines as appropriate. The list is not expected to have newlines already.
diff --git a/MissingH/IO/StatCompat.hs b/MissingH/IO/StatCompat.hs
index cabf71a..b48b2d9 100644
--- a/MissingH/IO/StatCompat.hs
+++ b/MissingH/IO/StatCompat.hs
@@ -35,7 +35,7 @@ Copyright (c) 2005-2006 John Goerzen, jgoerzen\@complete.org
module MissingH.IO.StatCompat
where
import System.Posix.Types
-import MissingH.IO.PosixConsts
+import System.IO.PosixConsts
#ifndef mingw32_HOST_OS
import System.Posix.Files(intersectFileModes)
#endif
diff --git a/MissingH/IO/WindowsCompat.hs b/MissingH/IO/WindowsCompat.hs
index 61c1262..182224c 100644
--- a/MissingH/IO/WindowsCompat.hs
+++ b/MissingH/IO/WindowsCompat.hs
@@ -51,7 +51,7 @@ Common usage might be like this:
>#endif
Or, to avoid having to use CPP and make things even easier, just import
-"MissingH.IO.PlafCompat", which essentially does the above.
+"System.IO.PlafCompat", which essentially does the above.
-}
@@ -65,7 +65,7 @@ where
import System.Posix.Types
import Data.Bits
import MissingH.IO.StatCompat
-import MissingH.IO.PosixConsts
+import System.IO.PosixConsts
import MissingH.Time
import System.Directory
diff --git a/MissingH/Network/FTP/Client.hs b/MissingH/Network/FTP/Client.hs
index 52498fe..f18cfc5 100644
--- a/MissingH/Network/FTP/Client.hs
+++ b/MissingH/Network/FTP/Client.hs
@@ -224,7 +224,7 @@ where
import MissingH.Network.FTP.ParserClient
import Network.BSD
import Network.Socket
-import MissingH.IO.Binary
+import System.IO.Binary
import qualified Network
import System.IO
import System.IO.Unsafe
diff --git a/MissingH/Network/FTP/Server.hs b/MissingH/Network/FTP/Server.hs
index 29c1673..67ec4af 100644
--- a/MissingH/Network/FTP/Server.hs
+++ b/MissingH/Network/FTP/Server.hs
@@ -40,7 +40,7 @@ This is a modular FTP server implementation in pure Haskell. It is highly
adaptable to many different tasks, and can serve up not only real files
and directories, but also virtually any data structure you could represent
as a filesystem. It does this by using the
-"MissingH.IO.HVFS" and "MissingH.IO.HVIO" modules.
+"System.IO.HVFS" and "System.IO.HVIO" modules.
In addition, basic networking and multitasking configuration is handled
via "MissingH.Network.SocketServer" and logging via
@@ -58,8 +58,8 @@ in a read-only manner:
>import MissingH.Network.FTP.Server
>import MissingH.Network.SocketServer
>import MissingH.Logging.Logger
->import MissingH.IO.HVFS
->import MissingH.IO.HVFS.Combinators
+>import System.IO.HVFS
+>import System.IO.HVFS.Combinators
>
>main = do
> updateGlobalLogger "" (setLevel DEBUG)
@@ -72,7 +72,7 @@ in a read-only manner:
> anonFtpHandler (HVFSReadOnly SystemFS)
Hint: if you wantto serve up only part of a filesystem, see
-'MissingH.IO.HVFS.Combinators.newHVFSChroot'.
+'System.IO.HVFS.Combinators.newHVFSChroot'.
-}
module MissingH.Network.FTP.Server(
@@ -90,10 +90,10 @@ import MissingH.Logging.Logger
import MissingH.Network
import MissingH.Network.SocketServer
import MissingH.Str
-import MissingH.IO.HVIO
-import MissingH.IO.HVFS
-import MissingH.IO.HVFS.InstanceHelpers
-import MissingH.IO.HVFS.Utils
+import System.IO.HVIO
+import System.IO.HVFS
+import System.IO.HVFS.InstanceHelpers
+import System.IO.HVFS.Utils
import Text.Printf
import Data.Char
import Data.IORef
diff --git a/MissingH/Path.hs b/MissingH/Path.hs
index a0e504b..861d8b4 100644
--- a/MissingH/Path.hs
+++ b/MissingH/Path.hs
@@ -54,7 +54,7 @@ import System.Directory
import Control.Exception
import System.IO
import MissingH.Path.NameManip
-import MissingH.IO.HVFS.Utils
+import System.IO.HVFS.Utils
{- | Splits a pathname into a tuple representing the root of the name and
the extension. The extension is considered to be all characters from the last
diff --git a/MissingH/Path/Glob.hs b/MissingH/Path/Glob.hs
index 4aa5c1e..af95d1c 100644
--- a/MissingH/Path/Glob.hs
+++ b/MissingH/Path/Glob.hs
@@ -34,7 +34,7 @@ in "MissingH.Path.WildMatch".
module MissingH.Path.Glob(glob, vGlob) where
import MissingH.List
import System.IO
-import MissingH.IO.HVFS
+import System.IO.HVFS
import MissingH.Path.FilePath
import Control.Exception
import MissingH.Path.WildMatch
diff --git a/debian/copyright b/debian/copyright
index 0fa7c22..75e140c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -72,7 +72,7 @@ John Goerzen has made these modifications:
MissingH and have been removed.
----------------------------------------------------
-The MissingH.IO.BlockIO module is from blockio 2005-02-14 at
+The System.IO.BlockIO module is from blockio 2005-02-14 at
http://cryp.to/blockio/.
Copyright/License:
diff --git a/src/Database/AnyDBM/StringDBM.hs b/src/Database/AnyDBM/StringDBM.hs
index 3be5d7a..afbe579 100644
--- a/src/Database/AnyDBM/StringDBM.hs
+++ b/src/Database/AnyDBM/StringDBM.hs
@@ -42,8 +42,8 @@ module Database.AnyDBM.StringDBM (StringDBM,
where
import Database.AnyDBM
import System.IO
-import MissingH.IO.HVFS
-import MissingH.IO.HVIO
+import System.IO.HVFS
+import System.IO.HVIO
import Data.HashTable
import Control.Concurrent.MVar
diff --git a/MissingH/IO/Binary.hs b/src/System/IO/Binary.hs
similarity index 98%
rename from MissingH/IO/Binary.hs
rename to src/System/IO/Binary.hs
index 9c8cc6c..df4e666 100644
--- a/MissingH/IO/Binary.hs
+++ b/src/System/IO/Binary.hs
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : MissingH.IO.Binary
+ Module : System.IO.Binary
Copyright : Copyright (C) 2004-2005 John Goerzen
License : GNU GPL, version 2 or above
@@ -33,7 +33,7 @@ or lists of Word8. The BinaryConvertible class provides this abstraction.
Wherever you see HVIO, you can transparently substite a regular Handle.
This module can work with any HVIO object, however. See
-"MissingH.IO.HVIO" for more details.
+"System.IO.HVIO" for more details.
Versions of MissingH prior 0.11.6 lacked the 'BinaryConvertible' class
and worked only with Strings and Handles.
@@ -55,12 +55,12 @@ is the support status:
Non-binary functions may be found in "MissingH.IO".
-See also: "MissingH.IO.BlockIO"
+See also: "System.IO.BlockIO"
Written by John Goerzen, jgoerzen\@complete.org
-}
-module MissingH.IO.Binary(
+module System.IO.Binary(
-- * Support for different types of blocks
BinaryConvertible(..),
-- * Entire File\/Handle Utilities
@@ -89,8 +89,8 @@ import Foreign.Marshal.Array
import Data.Word
import System.IO.Unsafe
import System.IO
-import MissingH.IO.HVIO
-import MissingH.IO.HVFS
+import System.IO.HVIO
+import System.IO.HVFS
{- | Provides support for handling binary blocks with convenient
types.
@@ -148,7 +148,7 @@ semantice are the same as with 'hGetBuf'; namely, the empty string
is returned with EOF is reached, and any given read may read fewer
bytes than the given length.
-(Actually, it's a wrapper around 'MissingH.IO.HVIO.vGetBuf') -}
+(Actually, it's a wrapper around 'System.IO.HVIO.vGetBuf') -}
hGetBufStr :: (HVIO a, BinaryConvertible b) => a -> Int -> IO [b]
hGetBufStr f count = fromBuf count (\buf -> vGetBuf f buf count)
diff --git a/MissingH/IO/BlockIO.hs b/src/System/IO/BlockIO.hs
similarity index 98%
rename from MissingH/IO/BlockIO.hs
rename to src/System/IO/BlockIO.hs
index 9224922..d26d672 100644
--- a/MissingH/IO/BlockIO.hs
+++ b/src/System/IO/BlockIO.hs
@@ -1,6 +1,6 @@
{-# OPTIONS -fglasgow-exts #-}
{- |
- Module : MissingH.IO.BlockIO
+ Module : System.IO.BlockIO
Copyright : (c) 2005-02-10 by Peter Simons
License : GPL2
@@ -14,7 +14,7 @@
But it does it /fast/.
-}
-module MissingH.IO.BlockIO where
+module System.IO.BlockIO where
import Prelude hiding ( catch, rem )
import Control.Exception
diff --git a/MissingH/IO/HVFS.hs b/src/System/IO/HVFS.hs
similarity index 98%
rename from MissingH/IO/HVFS.hs
rename to src/System/IO/HVFS.hs
index 41c3c2b..acf7d9b 100644
--- a/MissingH/IO/HVFS.hs
+++ b/src/System/IO/HVFS.hs
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : MissingH.IO.HVFS
+ Module : System.IO.HVFS
Copyright : Copyright (C) 2004-2005 John Goerzen
License : GNU GPL, version 2 or above
@@ -44,13 +44,13 @@ you can just use 'SystemFS'.
The "MissingH.HVFS.IO.InstanceHelpers" module contains some code to help
you make your own HVFS instances.
-The 'HVFSOpenable' class works together with the "MissingH.IO.HVIO" module
+The 'HVFSOpenable' class works together with the "System.IO.HVIO" module
to provide a complete virtual filesystem and I\/O model that allows you
to open up virtual filesystem files and act upon them in a manner similar
to standard Handles.
-}
-module MissingH.IO.HVFS(-- * Implementation Classes \/ Types
+module System.IO.HVFS(-- * Implementation Classes \/ Types
HVFS(..), HVFSStat(..),
HVFSOpenable(..), HVFSOpenEncap(..),HVFSStatEncap(..),
withStat, withOpen,
@@ -62,11 +62,11 @@ module MissingH.IO.HVFS(-- * Implementation Classes \/ Types
)
where
-import MissingH.IO.HVIO
+import System.IO.HVIO
import MissingH.Time
import System.IO
import System.IO.Error
-import MissingH.IO.PlafCompat
+import System.IO.PlafCompat
import System.Posix.Types
import System.Time
import System.Directory
diff --git a/MissingH/IO/HVFS/Combinators.hs b/src/System/IO/HVFS/Combinators.hs
similarity index 97%
rename from MissingH/IO/HVFS/Combinators.hs
rename to src/System/IO/HVFS/Combinators.hs
index c448165..5c4cb09 100644
--- a/MissingH/IO/HVFS/Combinators.hs
+++ b/src/System/IO/HVFS/Combinators.hs
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : MissingH.IO.HVFS.Combinators
+ Module : System.IO.HVFS.Combinators
Copyright : Copyright (C) 2004-2005 John Goerzen
License : GNU GPL, version 2 or above
@@ -32,16 +32,16 @@ Copyright (c) 2004-2005 John Goerzen, jgoerzen\@complete.org
-}
-module MissingH.IO.HVFS.Combinators(
+module System.IO.HVFS.Combinators(
-- * Restrictions
HVFSReadOnly(..),
HVFSChroot, newHVFSChroot
)
where
-import MissingH.IO.HVFS
-import MissingH.IO.HVIO
-import MissingH.IO.HVFS.InstanceHelpers
+import System.IO.HVFS
+import System.IO.HVIO
+import System.IO.HVFS.InstanceHelpers
import System.IO
import System.IO.Error
#ifndef mingw32_HOST_OS
diff --git a/MissingH/IO/HVFS/InstanceHelpers.hs b/src/System/IO/HVFS/InstanceHelpers.hs
similarity index 97%
rename from MissingH/IO/HVFS/InstanceHelpers.hs
rename to src/System/IO/HVFS/InstanceHelpers.hs
index 043aa72..1ff5f6b 100644
--- a/MissingH/IO/HVFS/InstanceHelpers.hs
+++ b/src/System/IO/HVFS/InstanceHelpers.hs
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : MissingH.IO.HVFS.InstanceHelpers
+ Module : System.IO.HVFS.InstanceHelpers
Copyright : Copyright (C) 2004 John Goerzen
License : GNU GPL, version 2 or above
@@ -26,12 +26,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Portability: portable
Utilities for creating instances of the items defined in
-"MissingH.IO.HVFS".
+"System.IO.HVFS".
Copyright (c) 2004 John Goerzen, jgoerzen\@complete.org
-}
-module MissingH.IO.HVFS.InstanceHelpers(-- * HVFSStat objects
+module System.IO.HVFS.InstanceHelpers(-- * HVFSStat objects
SimpleStat(..),
-- * HVFS objects & types
-- ** MemoryVFS
@@ -44,7 +44,7 @@ module MissingH.IO.HVFS.InstanceHelpers(-- * HVFSStat objects
getFullSlice
)
where
-import MissingH.IO.HVFS
+import System.IO.HVFS
import Data.IORef
import Data.List
import MissingH.Path
@@ -52,9 +52,9 @@ import MissingH.Path.NameManip
import Control.Monad.Error
import System.IO.Error
import System.IO
-import MissingH.IO.HVIO
+import System.IO.HVIO
-{- | A simple "MissingH.IO.HVFS.HVFSStat"
+{- | A simple "System.IO.HVFS.HVFSStat"
class that assumes that everything is either a file
or a directory. -}
data SimpleStat = SimpleStat {
diff --git a/MissingH/IO/HVFS/Utils.hs b/src/System/IO/HVFS/Utils.hs
similarity index 97%
rename from MissingH/IO/HVFS/Utils.hs
rename to src/System/IO/HVFS/Utils.hs
index 99f301a..c276963 100644
--- a/MissingH/IO/HVFS/Utils.hs
+++ b/src/System/IO/HVFS/Utils.hs
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : MissingH.IO.HVFS.Utils
+ Module : System.IO.HVFS.Utils
Copyright : Copyright (C) 2004-2005 John Goerzen
License : GNU GPL, version 2 or above
@@ -35,7 +35,7 @@ To operate on your system's main filesystem, just pass SystemFS as the
first parameter to these functions.
-}
-module MissingH.IO.HVFS.Utils (recurseDir,
+module System.IO.HVFS.Utils (recurseDir,
recurseDirStat,
recursiveRemove,
lsl,
@@ -43,9 +43,9 @@ module MissingH.IO.HVFS.Utils (recurseDir,
)
where
-import MissingH.IO.HVFS
+import System.IO.HVFS
import MissingH.Time
-import MissingH.IO.PlafCompat
+import System.IO.PlafCompat
import Text.Printf
import System.Time
import System.Locale
diff --git a/MissingH/IO/HVIO.hs b/src/System/IO/HVIO.hs
similarity index 99%
rename from MissingH/IO/HVIO.hs
rename to src/System/IO/HVIO.hs
index 5373f57..8cf746c 100644
--- a/MissingH/IO/HVIO.hs
+++ b/src/System/IO/HVIO.hs
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : MissingH.IO.HVIO
+ Module : System.IO.HVIO
Copyright : Copyright (C) 2004-2006 John Goerzen
License : GNU GPL, version 2 or above
@@ -106,11 +106,11 @@ pipes cannot be used across a fork(). Also unlike Unix pipes, these pipes
are portable and interact well with Haskell threads. A new pipe can be created
with a call to 'newHVIOPipe'.
-Together with "MissingH.IO.HVFS", this module is part of a complete
+Together with "System.IO.HVFS", this module is part of a complete
virtual filesystem solution.
-}
-module MissingH.IO.HVIO(-- * Implementation Classes
+module System.IO.HVIO(-- * Implementation Classes
HVIO(..),
-- * Standard HVIO Implementations
diff --git a/MissingH/IO/PlafCompat.hs b/src/System/IO/PlafCompat.hs
similarity index 96%
rename from MissingH/IO/PlafCompat.hs
rename to src/System/IO/PlafCompat.hs
index 83b2069..61af1ef 100644
--- a/MissingH/IO/PlafCompat.hs
+++ b/src/System/IO/PlafCompat.hs
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : MissingH.IO.PlafCompat
+ Module : System.IO.PlafCompat
Copyright : Copyright (C) 2005 John Goerzen
License : GNU GPL, version 2 or above
@@ -34,7 +34,7 @@ The result should be roughly the same set of defined variables and types.
-}
-module MissingH.IO.PlafCompat
+module System.IO.PlafCompat
(nullFileName,
#ifdef mingw32_HOST_OS
module MissingH.IO.WindowsCompat,
diff --git a/MissingH/IO/PosixConsts.hs b/src/System/IO/Posix/Consts.hs
similarity index 95%
rename from MissingH/IO/PosixConsts.hs
rename to src/System/IO/Posix/Consts.hs
index 8c835d1..d42efc6 100644
--- a/MissingH/IO/PosixConsts.hs
+++ b/src/System/IO/Posix/Consts.hs
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : MissingH.IO.PosixConsts
+ Module : System.IO.PosixConsts
Copyright : Copyright (C) 2005 John Goerzen
License : GNU GPL, version 2 or above
@@ -31,7 +31,7 @@ by default.
-}
-module MissingH.IO.PosixConsts where
+module System.IO.PosixConsts where
import System.Posix.Types
blockSpecialMode :: FileMode
diff --git a/MissingH/HUnit.hs b/src/Test/HUnit/Utils.hs
similarity index 97%
rename from MissingH/HUnit.hs
rename to src/Test/HUnit/Utils.hs
index 06a6cb5..7a2cfa1 100644
--- a/MissingH/HUnit.hs
+++ b/src/Test/HUnit/Utils.hs
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : MissingH.HUnit
+ Module : Test.HUnit.Utils
Copyright : Copyright (C) 2004-2005 John Goerzen
License : GNU GPL, version 2 or above
@@ -32,7 +32,7 @@ Written by John Goerzen, jgoerzen\@complete.org
-module MissingH.HUnit(assertRaises, mapassertEqual, qccheck, qctest) where
+module Test.HUnit.Utils(assertRaises, mapassertEqual, qccheck, qctest) where
import Test.HUnit
import Test.QuickCheck as QC
import qualified Control.Exception
diff --git a/testsrc/AnyDBMtest.hs b/testsrc/AnyDBMtest.hs
index ea41f24..9da1579 100644
--- a/testsrc/AnyDBMtest.hs
+++ b/testsrc/AnyDBMtest.hs
@@ -19,13 +19,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
module AnyDBMtest(mf, generic_persist_test, generic_test, tests) where
import Test.HUnit
import MissingH.List
-import MissingH.IO.HVFS
-import MissingH.IO.HVFS.InstanceHelpers
+import System.IO.HVFS
+import System.IO.HVFS.InstanceHelpers
import Database.AnyDBM
import Database.AnyDBM.StringDBM
import Database.AnyDBM.MapDBM
import System.Directory
-import MissingH.IO.HVFS.Utils
+import System.IO.HVFS.Utils
import MissingH.Path.FilePath
import Data.HashTable
import Data.List(sort)
diff --git a/testsrc/ConfigParser/Maintest.hs b/testsrc/ConfigParser/Maintest.hs
index ce4a155..739a4c0 100644
--- a/testsrc/ConfigParser/Maintest.hs
+++ b/testsrc/ConfigParser/Maintest.hs
@@ -20,8 +20,8 @@ module ConfigParser.Maintest(tests) where
import Test.HUnit
import Data.ConfigFile
import Data.Either.Utils
-import MissingH.IO.PlafCompat(nullFileName)
-import MissingH.HUnit
+import System.IO.PlafCompat(nullFileName)
+import Test.HUnit.Utils
import Control.Exception
import System.IO
diff --git a/testsrc/ConfigParser/Parsertest.hs b/testsrc/ConfigParser/Parsertest.hs
index 87a23b3..43f836e 100644
--- a/testsrc/ConfigParser/Parsertest.hs
+++ b/testsrc/ConfigParser/Parsertest.hs
@@ -20,7 +20,7 @@ module ConfigParser.Parsertest(tests) where
import Test.HUnit
import Data.ConfigFile.Parser
import Data.ConfigFile.Types
-import MissingH.HUnit
+import Test.HUnit.Utils
import Control.Exception
test_basic =
diff --git a/testsrc/Eithertest.hs b/testsrc/Eithertest.hs
index dc0ac24..8a3d8f1 100644
--- a/testsrc/Eithertest.hs
+++ b/testsrc/Eithertest.hs
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
module Eithertest(tests) where
import Test.HUnit
import Data.Either.Utils
-import MissingH.HUnit
+import Test.HUnit.Utils
import Control.Exception
test_maybeToEither =
diff --git a/testsrc/GZiptest.hs b/testsrc/GZiptest.hs
index 1280fc3..0300c85 100644
--- a/testsrc/GZiptest.hs
+++ b/testsrc/GZiptest.hs
@@ -21,7 +21,7 @@ import Test.HUnit
import MissingH.FileArchive.GZip
import MissingH.Path.FilePath
import Data.Compression.Inflate
-import MissingH.IO.Binary
+import System.IO.Binary
import System.IO
import Data.Either.Utils
import Data.List
diff --git a/testsrc/Globtest.hs b/testsrc/Globtest.hs
index fdb5513..055f33d 100644
--- a/testsrc/Globtest.hs
+++ b/testsrc/Globtest.hs
@@ -21,8 +21,8 @@ module Globtest(tests) where
import Test.HUnit
import MissingH.Path.Glob
import MissingH.Path
-import MissingH.HUnit
-import MissingH.IO.HVFS
+import Test.HUnit.Utils
+import System.IO.HVFS
import System.Posix.Directory
import System.Posix.Files
import Control.Exception
diff --git a/testsrc/HVFStest.hs b/testsrc/HVFStest.hs
index 308974d..289c32d 100644
--- a/testsrc/HVFStest.hs
+++ b/testsrc/HVFStest.hs
@@ -18,11 +18,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
module HVFStest(tests) where
import Test.HUnit
-import MissingH.IO.HVIO
-import MissingH.IO.HVFS
-import MissingH.IO.HVFS.InstanceHelpers
-import MissingH.IO.HVFS.Combinators
-import MissingH.HUnit
+import System.IO.HVIO
+import System.IO.HVFS
+import System.IO.HVFS.InstanceHelpers
+import System.IO.HVFS.Combinators
+import Test.HUnit.Utils
import System.IO
import System.IO.Error
import Control.Exception
diff --git a/testsrc/HVIOtest.hs b/testsrc/HVIOtest.hs
index 7d16177..e9204e1 100644
--- a/testsrc/HVIOtest.hs
+++ b/testsrc/HVIOtest.hs
@@ -18,8 +18,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
module HVIOtest(tests) where
import Test.HUnit
-import MissingH.IO.HVIO
-import MissingH.HUnit
+import System.IO.HVIO
+import Test.HUnit.Utils
import System.IO
import System.IO.Error
import Control.Exception
diff --git a/testsrc/IOtest.hs b/testsrc/IOtest.hs
index 7f52eb3..9cc2216 100644
--- a/testsrc/IOtest.hs
+++ b/testsrc/IOtest.hs
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
module IOtest() where
import Test.HUnit
import MissingH.IO
-import MissingH.HUnit
+import Test.HUnit.Utils
diff --git a/testsrc/Listtest.hs b/testsrc/Listtest.hs
index df21c6d..5029249 100644
--- a/testsrc/Listtest.hs
+++ b/testsrc/Listtest.hs
@@ -22,7 +22,7 @@ import MissingH.List
import Data.List
import Test.HUnit
import Test.QuickCheck as QC
-import MissingH.HUnit
+import Test.HUnit.Utils
test_delFromAL =
let f :: [(String, Int)] -> [(String, Int)] -> Test
diff --git a/testsrc/Network/FTP/Parsertest.hs b/testsrc/Network/FTP/Parsertest.hs
index 0c69747..daec83d 100644
--- a/testsrc/Network/FTP/Parsertest.hs
+++ b/testsrc/Network/FTP/Parsertest.hs
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
module Network.FTP.Parsertest(tests) where
import Test.HUnit
import MissingH.Network.FTP.ParserClient
-import MissingH.HUnit
+import Test.HUnit.Utils
import Network.Socket
test_parseReply =
diff --git a/testsrc/Strtest.hs b/testsrc/Strtest.hs
index 1c2f3b7..172a9d3 100644
--- a/testsrc/Strtest.hs
+++ b/testsrc/Strtest.hs
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
module Strtest(tests) where
import Test.HUnit
import MissingH.Str
-import MissingH.HUnit
+import Test.HUnit.Utils
import Text.Regex
import Data.Char
diff --git a/testsrc/WildMatchtest.hs b/testsrc/WildMatchtest.hs
index 171c94d..576515c 100644
--- a/testsrc/WildMatchtest.hs
+++ b/testsrc/WildMatchtest.hs
@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
module WildMatchtest(tests) where
import Test.HUnit
import MissingH.Path.WildMatch
-import MissingH.HUnit
+import Test.HUnit.Utils
test_wildCheckCase =
let f patt name = TestCase $ assertBool (patt ++ "," ++ name ++ " was false")
--
haskell-testpack
More information about the Pkg-haskell-commits
mailing list