xml-conduit 1.2.6 → 1.3.0
raw patch · 5 files changed
+14/−14 lines, 5 filesdep −system-filepath
Dependencies removed: system-filepath
Files
- ChangeLog.md +4/−0
- Text/XML.hs +4/−5
- Text/XML/Stream/Parse.hs +2/−3
- Text/XML/Unresolved.hs +3/−4
- xml-conduit.cabal +1/−2
ChangeLog.md view
@@ -1,3 +1,7 @@+## 1.3.0++* Drop system-filepath+ ## 1.2.6 * Reuse 'MonadThrow' and 'force' for 'AttrParser' [#52](https://github.com/snoyberg/xml/pull/52)
Text/XML.hs view
@@ -91,8 +91,7 @@ import qualified Data.Text as T import Data.Either (partitionEithers) import Control.Monad.Trans.Resource (MonadThrow, monadThrow, runExceptionT, runResourceT)-import Prelude hiding (readFile, writeFile, FilePath)-import Filesystem.Path.CurrentOS (FilePath, encodeString)+import Prelude hiding (readFile, writeFile) import Control.Exception (SomeException, Exception, throwIO, handle) import Text.XML.Stream.Parse (ParseSettings, def, psDecodeEntities) import Data.ByteString (ByteString)@@ -230,7 +229,7 @@ readFile :: ParseSettings -> FilePath -> IO Document readFile ps fp = handle (throwIO . InvalidXMLFile fp)- (runResourceT $ CB.sourceFile (encodeString fp) $$ sinkDoc ps)+ (runResourceT $ CB.sourceFile fp $$ sinkDoc ps) data XMLException = InvalidXMLFile FilePath SomeException deriving Typeable@@ -238,7 +237,7 @@ instance Show XMLException where show (InvalidXMLFile fp e) = concat [ "Error parsing XML file "- , encodeString fp+ , fp , ": " , show e ]@@ -286,7 +285,7 @@ writeFile :: R.RenderSettings -> FilePath -> Document -> IO () writeFile rs fp doc =- runResourceT $ renderBytes rs doc $$ CB.sinkFile (encodeString fp)+ runResourceT $ renderBytes rs doc $$ CB.sinkFile fp renderLBS :: R.RenderSettings -> Document -> L.ByteString renderLBS rs doc =
Text/XML/Stream/Parse.hs view
@@ -130,8 +130,7 @@ import Data.Text.Read (Reader, decimal, hexadecimal) import Data.Typeable (Typeable) import Data.Word (Word32)-import Filesystem.Path.CurrentOS (FilePath, encodeString)-import Prelude hiding (FilePath, takeWhile)+import Prelude hiding (takeWhile) import Text.XML.Stream.Token type Ents = [(Text, Text)]@@ -691,7 +690,7 @@ => ParseSettings -> FilePath -> Producer m Event-parseFile ps fp = sourceFile (encodeString fp) =$= parseBytes ps+parseFile ps fp = sourceFile fp =$= parseBytes ps -- | Parse an event stream from a lazy 'L.ByteString'. parseLBS :: MonadThrow m
Text/XML/Unresolved.hs view
@@ -41,8 +41,7 @@ , R.rsNamespaces ) where -import Prelude hiding (writeFile, readFile, FilePath)-import Filesystem.Path.CurrentOS (FilePath, encodeString)+import Prelude hiding (writeFile, readFile) import Data.XML.Types import Control.Exception (Exception, SomeException) import Data.Typeable (Typeable)@@ -69,7 +68,7 @@ import Data.Conduit.Lazy (lazyConsume) readFile :: P.ParseSettings -> FilePath -> IO Document-readFile ps fp = runResourceT $ CB.sourceFile (encodeString fp) $$ sinkDoc ps+readFile ps fp = runResourceT $ CB.sourceFile fp $$ sinkDoc ps sinkDoc :: MonadThrow m => P.ParseSettings@@ -78,7 +77,7 @@ writeFile :: R.RenderSettings -> FilePath -> Document -> IO () writeFile rs fp doc =- runResourceT $ renderBytes rs doc $$ CB.sinkFile (encodeString fp)+ runResourceT $ renderBytes rs doc $$ CB.sinkFile fp renderLBS :: R.RenderSettings -> Document -> L.ByteString renderLBS rs doc =
xml-conduit.cabal view
@@ -1,5 +1,5 @@ name: xml-conduit-version: 1.2.6+version: 1.3.0 license: BSD3 license-file: LICENSE author: Michael Snoyman <michael@snoyman.com>, Aristid Breitkreuz <aristidb@googlemail.com>@@ -28,7 +28,6 @@ , blaze-builder >= 0.2 && < 0.5 , transformers >= 0.2 && < 0.5 , data-default- , system-filepath >= 0.4 && < 0.5 , monad-control >= 0.3 && < 1.1 , blaze-markup >= 0.5 , blaze-html >= 0.5