From 0d1b6f56779e49735fc367447c7993174f7fbe3f Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Tue, 29 Nov 2011 07:14:18 -0600
Subject: [PATCH] Revert "attoparsec 0.10"

This reverts commit 9c901f578526eb385e486a6986ea3b5eeef42778.
---
 Text/HTML/SanitizeXSS/Css.hs | 15 ++++++---------
 xss-sanitize.cabal           |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Text/HTML/SanitizeXSS/Css.hs b/Text/HTML/SanitizeXSS/Css.hs
index 3470608..f2a9a79 100644
--- a/Text/HTML/SanitizeXSS/Css.hs
+++ b/Text/HTML/SanitizeXSS/Css.hs
@@ -12,7 +12,7 @@ import Data.Attoparsec.Text
 import Data.Text.Lazy.Builder (toLazyText)
 import Data.Text.Lazy (toStrict)
 import Data.Set (member, fromList, Set)
-import Data.Char (isDigit, isSpace)
+import Data.Char (isDigit)
 import Control.Applicative ((<|>), pure)
 import Text.CSS.Render (renderAttrs)
 import Text.CSS.Parse (parseAttrs)
@@ -38,7 +38,7 @@ sanitizeCSS css = toStrict . toLazyText .
 
         rejectUrl = do
           pre <- manyTill anyChar (string "url")
-          skipWhile isSpace
+          skipMany space
           _<-char '('
           skipWhile (/= ')')
           _<-char ')'
@@ -82,11 +82,11 @@ allowedCssAttributeValue val =
     -- should have used sepBy (symbol ",")
     rgb = do
       _<- string "rgb("
-      skipWhile1 isDigit >> skipOk (== '%')
+      skipMany1 digit >> skipOk (== '%')
       skip (== ',')
-      skipWhile1 isDigit >> skipOk (== '%')
+      skipMany digit >> skipOk (== '%')
       skip (== ',')
-      skipWhile1 isDigit >> skipOk (== '%')
+      skipMany digit >> skipOk (== '%')
       skip (== ')')
       return True
 
@@ -95,7 +95,7 @@ allowedCssAttributeValue val =
       skipOk isDigit
       skipOk (== '.')
       skipOk isDigit >> skipOk isDigit
-      skipWhile isSpace
+      skipSpace
       unit <- takeText
       return $ T.null unit || unit `member` allowed_css_attribute_value_units
 
@@ -138,6 +138,3 @@ allowed_svg_properties = fromList acceptable_svg_properties
     acceptable_svg_properties = [ "fill", "fill-opacity", "fill-rule",
         "stroke", "stroke-width", "stroke-linecap", "stroke-linejoin",
         "stroke-opacity"]
-
-skipWhile1 :: (Char -> Bool) -> Parser ()
-skipWhile1 f = skip f >> skipWhile f
diff --git a/xss-sanitize.cabal b/xss-sanitize.cabal
index 83feed4..c0ab47f 100644
--- a/xss-sanitize.cabal
+++ b/xss-sanitize.cabal
@@ -20,7 +20,7 @@ library
                     , network >= 2
                     , css-text >= 0.1 && < 0.2
                     , text                      >= 0.11     && < 0.12
-                    , attoparsec                >= 0.10     && < 0.11
+                    , attoparsec-text           >= 0.8.5.1  && < 0.9
 
 
     exposed-modules: Text.HTML.SanitizeXSS