From 53933b3b8ee51ae99037ef3ef0bab3985412d26a Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 5 Sep 2011 19:17:03 +0300 Subject: [PATCH] xml/http-enumerator bumps --- OpenId2/XRDS.hs | 6 +++--- authenticate.cabal | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenId2/XRDS.hs b/OpenId2/XRDS.hs index 1c966469..96771ff5 100644 --- a/OpenId2/XRDS.hs +++ b/OpenId2/XRDS.hs @@ -22,8 +22,8 @@ module OpenId2.XRDS ( -- Libraries import Control.Monad ((>=>)) import Data.Maybe (listToMaybe) -import Text.XML.Enumerator.Resolved (parseLBS, decodeEntities) -import Text.XML.Enumerator.Cursor (fromDocument, element, content, ($/), (&|), Cursor, (&/), attribute) +import Text.XML (parseLBS, def) +import Text.XML.Cursor (fromDocument, element, content, ($/), (&|), Cursor, (&/), attribute) import qualified Data.ByteString.Lazy as L import Data.Text (Text) import qualified Data.Text.Read @@ -47,7 +47,7 @@ parseXRDS str = either (const Nothing) (Just . parseXRDS' . fromDocument) - (parseLBS str decodeEntities) + (parseLBS def str) parseXRDS' :: Cursor -> [[Service]] parseXRDS' = element "{xri://$xrds}XRDS" &/ diff --git a/authenticate.cabal b/authenticate.cabal index cda9392f..092dfe1b 100644 --- a/authenticate.cabal +++ b/authenticate.cabal @@ -1,5 +1,5 @@ name: authenticate -version: 0.10.1 +version: 0.10.2 license: BSD3 license-file: LICENSE author: Michael Snoyman, Hiromi Ishii, Arash Rouhani @@ -16,7 +16,7 @@ homepage: http://github.com/snoyberg/authenticate/tree/master library build-depends: base >= 4 && < 5, aeson-native >= 0.3.2.11 && < 0.4, - http-enumerator >= 0.6.5.4 && < 0.7, + http-enumerator >= 0.6.5.4 && < 0.8, tagsoup >= 0.12 && < 0.13, failure >= 0.0.0 && < 0.2, transformers >= 0.1 && < 0.3, @@ -31,7 +31,7 @@ library text >= 0.5 && < 1.0, http-types >= 0.6 && < 0.7, enumerator >= 0.4.7 && < 0.5, - xml-enumerator >= 0.3.4 && < 0.4, + xml-enumerator >= 0.4 && < 0.5, blaze-builder >= 0.2 && < 0.4, attoparsec >= 0.9 && < 0.10, tls >= 0.7 && < 0.8,