From 125090aebbacfb139b9c1e8f75873422340a2da2 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 10 Nov 2010 09:41:42 +0200 Subject: [PATCH] blaze-builder 0.2 --- Yesod/Form/Profiles.hs | 6 +++--- Yesod/Json.hs | 6 +++--- yesod.cabal | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Yesod/Form/Profiles.hs b/Yesod/Form/Profiles.hs index 26442d6f..fb436f92 100644 --- a/Yesod/Form/Profiles.hs +++ b/Yesod/Form/Profiles.hs @@ -26,8 +26,8 @@ import Network.URI (parseURI) import Database.Persist (PersistField) import Text.HTML.SanitizeXSS (sanitizeBalance) -import Text.Blaze.Builder.Utf8 (writeChar) -import Text.Blaze.Builder.Core (writeList, writeByteString) +import Blaze.ByteString.Builder.Char.Utf8 (writeChar) +import Blaze.ByteString.Builder (fromWrite4List, writeByteString) import Yesod.Internal (lbsToChars) @@ -87,7 +87,7 @@ newtype Textarea = Textarea { unTextarea :: String } deriving (Show, Read, Eq, PersistField) instance ToHtml Textarea where toHtml = - Html . writeList writeHtmlEscapedChar . unTextarea + Html . fromWrite4List writeHtmlEscapedChar . unTextarea where -- Taken from blaze-builder and modified with newline handling. writeHtmlEscapedChar '<' = writeByteString "<" diff --git a/Yesod/Json.hs b/Yesod/Json.hs index fe96cfbd..797ad44e 100644 --- a/Yesod/Json.hs +++ b/Yesod/Json.hs @@ -23,8 +23,8 @@ import Data.Char (isControl) import Yesod.Handler (GHandler) import Numeric (showHex) import Data.Monoid (Monoid (..)) -import Text.Blaze.Builder.Core -import Text.Blaze.Builder.Utf8 (writeChar) +import Blaze.ByteString.Builder +import Blaze.ByteString.Builder.Char.Utf8 (writeChar) #if TEST import Test.Framework (testGroup, Test) @@ -63,7 +63,7 @@ jsonToRepJson = fmap RepJson . jsonToContent jsonScalar :: String -> Json jsonScalar s = Json $ mconcat [ fromByteString "\"" - , writeList writeJsonChar s + , fromWrite4List writeJsonChar s , fromByteString "\"" ] where diff --git a/yesod.cabal b/yesod.cabal index 4d8dd34a..2501617b 100644 --- a/yesod.cabal +++ b/yesod.cabal @@ -1,5 +1,5 @@ name: yesod -version: 0.6.1 +version: 0.6.1.1 license: BSD3 license-file: LICENSE author: Michael Snoyman @@ -31,7 +31,7 @@ library , template-haskell >= 2.4 && < 2.6 , web-routes-quasi >= 0.6 && < 0.7 , hamlet >= 0.5.1 && < 0.7 - , blaze-builder >= 0.1 && < 0.2 + , blaze-builder >= 0.2 && < 0.3 , transformers >= 0.2 && < 0.3 , clientsession >= 0.4.0 && < 0.5 , pureMD5 >= 1.1.0.0 && < 2.2