[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:18:04 UTC 2010
The following commit has been merged in the master branch:
commit 7c625212168a7946aa2030a6e00da9285a7d5f92
Author: John Goerzen <jgoerzen at complete.org>
Date: Sun Dec 3 10:02:44 2006 +0100
Renamed MissingH.Path to System.Path, refs #1
diff --git a/COPYRIGHT b/COPYRIGHT
index 75e140c..1b0d1a2 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -126,7 +126,7 @@ Copyright/License for all Wash modules:
POSSIBILITY OF SUCH DAMAGE.
----------------------------------------------------
-Portions if MissingH.Path come from Volker Wysk's HsShellScript
+Portions if System.Path come from Volker Wysk's HsShellScript
library, version 2.1.0. That code is Copyright (c) 2004 Volker Wysk
and is licensed under the GNU LGPL 2.1
@@ -200,7 +200,7 @@ TO THOSE CONCERNED ABOUT THE LAW:
-- SMH, Creator, Programmer.
----------------------------------------------------
-MissingH.Path.FilePath was written by Isaac Jones. It was pulled from
+System.Path.FilePath was written by Isaac Jones. It was pulled from
the darcs repository at
http://www.scannedinavian.org/~lemmih/FilePath/ as of July 21, 2005.
diff --git a/MissingH.cabal b/MissingH.cabal
index ad770ad..ffd0c7c 100644
--- a/MissingH.cabal
+++ b/MissingH.cabal
@@ -23,8 +23,8 @@ Exposed-Modules: MissingH.Str, System.IO, System.IO.Binary, Data.List.Utils,
MissingH.ProgressTracker,
MissingH.ProgressMeter,
MissingH.Quantity,
- Data.Map.Utils, MissingH.Path, MissingH.Path.NameManip,
- MissingH.Path.FilePath, MissingH.Path.WildMatch, MissingH.Path.Glob,
+ Data.Map.Utils, System.Path, System.Path.NameManip,
+ System.Path.FilePath, System.Path.WildMatch, System.Path.Glob,
MissingH.Time, MissingH.Time.ParseDate,
Network.Utils,
Network.FTP.Client,
diff --git a/MissingH/Path/FilePath.hs b/MissingH/Path/FilePath.hs
index f18e572..61820bf 100644
--- a/MissingH/Path/FilePath.hs
+++ b/MissingH/Path/FilePath.hs
@@ -1,4 +1,4 @@
-module MissingH.Path.FilePath
+module System.Path.FilePath
( -- * File path
FilePath
, splitFileName
diff --git a/MissingH/Path/Glob.hs b/MissingH/Path/Glob.hs
index 6aa4f00..e17020d 100644
--- a/MissingH/Path/Glob.hs
+++ b/MissingH/Path/Glob.hs
@@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : MissingH.Path.Glob
+ Module : System.Path.Glob
Copyright : Copyright (C) 2006 John Goerzen
License : GNU GPL, version 2 or above
@@ -27,22 +27,22 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Functions for expanding wildcards, filenames, and pathnames.
For information on the metacharacters recognized, please see the notes
-in "MissingH.Path.WildMatch".
+in "System.Path.WildMatch".
-}
-module MissingH.Path.Glob(glob, vGlob) where
+module System.Path.Glob(glob, vGlob) where
import Data.List.Utils
import System.IO
import System.IO.HVFS
-import MissingH.Path.FilePath
+import System.Path.FilePath
import Control.Exception
-import MissingH.Path.WildMatch
+import System.Path.WildMatch
hasWild = hasAny "*?["
{- | Takes a pattern. Returns a list of names that match that pattern.
-The pattern is evaluated by "MissingH.Path.WildMatch". This function
+The pattern is evaluated by "System.Path.WildMatch". This function
does not perform tilde or environment variable expansion.
Filenames that begin with a dot are not included in the result set unless
diff --git a/MissingH/Path/NameManip.hs b/MissingH/Path/NameManip.hs
index a8cc03c..adcc912 100644
--- a/MissingH/Path/NameManip.hs
+++ b/MissingH/Path/NameManip.hs
@@ -3,7 +3,7 @@
-}
{- |
- Module : MissingH.Path.NameManip
+ Module : System.Path.NameManip
Copyright : Copyright (C) 2004 Volker Wysk
License : GNU LGPL, version 2.1 or above
@@ -16,7 +16,7 @@ Low-level path name manipulations.
Written by Volker Wysk
-}
-module MissingH.Path.NameManip where
+module System.Path.NameManip where
import Data.List
import System.Directory
diff --git a/MissingH/Path/WildMatch.hs b/MissingH/Path/WildMatch.hs
index a0eaa8f..4e393e8 100644
--- a/MissingH/Path/WildMatch.hs
+++ b/MissingH/Path/WildMatch.hs
@@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : MissingH.Path.WildMatch
+ Module : System.Path.WildMatch
Copyright : Copyright (C) 2006 John Goerzen
License : GNU GPL, version 2 or above
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Stability : provisional
Portability: portable
-Matching filenames with wildcards. See also "MissingH.Path.Glob" for
+Matching filenames with wildcards. See also "System.Path.Glob" for
support for generating lists of files based on wildcards.
Inspired by fnmatch.py, part of the Python standard library.
@@ -51,7 +51,7 @@ Please note:
* Neither the path separator (the slash or backslash) nor the period carry
any special meaning for the functions in this module. That is, @*@ will
match @\/@ in a filename. If this is not the behavior you want, you probably
-want "MissingH.Path.Glob" instead of this module.
+want "System.Path.Glob" instead of this module.
* Unlike the Unix shell, filenames that begin with a period are not ignored
by this module. That is, @*.txt@ will match @.test.txt at .
@@ -59,7 +59,7 @@ by this module. That is, @*.txt@ will match @.test.txt at .
* This module does not current permit escaping of special characters.
-}
-module MissingH.Path.WildMatch (-- * Wildcard matching
+module System.Path.WildMatch (-- * Wildcard matching
wildCheckCase,
wildToRegex
)
diff --git a/debian/copyright b/debian/copyright
index 75e140c..1b0d1a2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -126,7 +126,7 @@ Copyright/License for all Wash modules:
POSSIBILITY OF SUCH DAMAGE.
----------------------------------------------------
-Portions if MissingH.Path come from Volker Wysk's HsShellScript
+Portions if System.Path come from Volker Wysk's HsShellScript
library, version 2.1.0. That code is Copyright (c) 2004 Volker Wysk
and is licensed under the GNU LGPL 2.1
@@ -200,7 +200,7 @@ TO THOSE CONCERNED ABOUT THE LAW:
-- SMH, Creator, Programmer.
----------------------------------------------------
-MissingH.Path.FilePath was written by Isaac Jones. It was pulled from
+System.Path.FilePath was written by Isaac Jones. It was pulled from
the darcs repository at
http://www.scannedinavian.org/~lemmih/FilePath/ as of July 21, 2005.
diff --git a/src/Data/MIME/Types.hs b/src/Data/MIME/Types.hs
index 01a0762..81f9ed5 100644
--- a/src/Data/MIME/Types.hs
+++ b/src/Data/MIME/Types.hs
@@ -50,7 +50,7 @@ import Monad
import System.IO
import System.IO.Error
import System.IO
-import MissingH.Path
+import System.Path
import Data.Map.Utils
import Data.Char
diff --git a/src/System/IO/HVFS/Combinators.hs b/src/System/IO/HVFS/Combinators.hs
index 5c4cb09..4db964e 100644
--- a/src/System/IO/HVFS/Combinators.hs
+++ b/src/System/IO/HVFS/Combinators.hs
@@ -50,8 +50,8 @@ import System.Posix.Files
import System.Posix.Types
import System.Time
import System.Directory
-import MissingH.Path
-import MissingH.Path.NameManip
+import System.Path
+import System.Path.NameManip
----------------------------------------------------------------------
-- Providing read-only access
diff --git a/src/System/IO/HVFS/InstanceHelpers.hs b/src/System/IO/HVFS/InstanceHelpers.hs
index 1ff5f6b..9674b7f 100644
--- a/src/System/IO/HVFS/InstanceHelpers.hs
+++ b/src/System/IO/HVFS/InstanceHelpers.hs
@@ -47,8 +47,8 @@ where
import System.IO.HVFS
import Data.IORef
import Data.List
-import MissingH.Path
-import MissingH.Path.NameManip
+import System.Path
+import System.Path.NameManip
import Control.Monad.Error
import System.IO.Error
import System.IO
@@ -103,7 +103,7 @@ newMemoryVFSRef r = do
c <- newIORef "/"
return (MemoryVFS {content = r, cwd = c})
-{- | Similar to 'MissingH.Path.NameManip' but the first element
+{- | Similar to 'System.Path.NameManip' but the first element
won't be @\/@.
>nice_slice "/" -> []
diff --git a/MissingH/Path.hs b/src/System/Path.hs
similarity index 98%
rename from MissingH/Path.hs
rename to src/System/Path.hs
index e6a80fa..aa37a5a 100644
--- a/MissingH/Path.hs
+++ b/src/System/Path.hs
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : MissingH.Path
+ Module : System.Path
Copyright : Copyright (C) 2004-2005 John Goerzen
License : GNU GPL, version 2 or above
@@ -32,7 +32,7 @@ file names, directories, and related support.
Written by John Goerzen, jgoerzen\@complete.org
-}
-module MissingH.Path(-- * Name processing
+module System.Path(-- * Name processing
splitExt, absNormPath, secureAbsNormPath,
-- * Directory Processing
recurseDir, recurseDirStat, recursiveRemove,
@@ -53,7 +53,7 @@ import System.Directory
#endif
import Control.Exception
import System.IO
-import MissingH.Path.NameManip
+import System.Path.NameManip
import System.IO.HVFS.Utils
{- | Splits a pathname into a tuple representing the root of the name and
diff --git a/testsrc/AnyDBMtest.hs b/testsrc/AnyDBMtest.hs
index a84e8cb..8f9ec7b 100644
--- a/testsrc/AnyDBMtest.hs
+++ b/testsrc/AnyDBMtest.hs
@@ -26,7 +26,7 @@ import Database.AnyDBM.StringDBM
import Database.AnyDBM.MapDBM
import System.Directory
import System.IO.HVFS.Utils
-import MissingH.Path.FilePath
+import System.Path.FilePath
import Data.HashTable
import Data.List(sort)
import Control.Exception(finally)
diff --git a/testsrc/GZiptest.hs b/testsrc/GZiptest.hs
index 0300c85..d4e0228 100644
--- a/testsrc/GZiptest.hs
+++ b/testsrc/GZiptest.hs
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
module GZiptest(tests) where
import Test.HUnit
import MissingH.FileArchive.GZip
-import MissingH.Path.FilePath
+import System.Path.FilePath
import Data.Compression.Inflate
import System.IO.Binary
import System.IO
diff --git a/testsrc/Globtest.hs b/testsrc/Globtest.hs
index 055f33d..cee32c7 100644
--- a/testsrc/Globtest.hs
+++ b/testsrc/Globtest.hs
@@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
module Globtest(tests) where
import Test.HUnit
-import MissingH.Path.Glob
-import MissingH.Path
+import System.Path.Glob
+import System.Path
import Test.HUnit.Utils
import System.IO.HVFS
import System.Posix.Directory
diff --git a/testsrc/Pathtest.hs b/testsrc/Pathtest.hs
index dc25ee1..7da2aa3 100644
--- a/testsrc/Pathtest.hs
+++ b/testsrc/Pathtest.hs
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
module Pathtest(tests) where
import Test.HUnit
-import MissingH.Path
+import System.Path
test_absNormPath =
let f base p exp = TestLabel (show (base, p)) $ TestCase $ exp @=? absNormPath base p
diff --git a/testsrc/WildMatchtest.hs b/testsrc/WildMatchtest.hs
index 576515c..368c26f 100644
--- a/testsrc/WildMatchtest.hs
+++ b/testsrc/WildMatchtest.hs
@@ -19,7 +19,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 System.Path.WildMatch
import Test.HUnit.Utils
test_wildCheckCase =
--
haskell-testpack
More information about the Pkg-haskell-commits
mailing list