From 594f21e5bdc6b3687d8c54298934e2396c2d709e Mon Sep 17 00:00:00 2001
From: Daniel Ehrenberg <littledan@Macintosh-103.local>
Date: Tue, 3 Feb 2009 19:44:28 -0600
Subject: [PATCH] Fixing HTTP and IANA tests

---
 basis/http/http.factor                    | 14 +++++---------
 basis/io/encodings/iana/iana-tests.factor |  8 ++++----
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/basis/http/http.factor b/basis/http/http.factor
index cda3460c71..2b5414b299 100755
--- a/basis/http/http.factor
+++ b/basis/http/http.factor
@@ -3,17 +3,11 @@
 USING: accessors kernel combinators math namespaces make assocs
 sequences splitting sorting sets strings vectors hashtables
 quotations arrays byte-arrays math.parser calendar
-calendar.format present urls
-
+calendar.format present urls fry
 io io.encodings io.encodings.iana io.encodings.binary
 io.encodings.8-bit io.crlf
-
 unicode.case unicode.categories
-
 http.parsers ;
-
-EXCLUDE: fry => , ;
-
 IN: http
 
 : (read-header) ( -- alist )
@@ -217,5 +211,7 @@ TUPLE: post-data data params content-type content-encoding ;
     " " split harvest [ "=" split1 [ >lower ] dip ] { } map>assoc ;
 
 : parse-content-type ( content-type -- type encoding )
-    ";" split1 parse-content-type-attributes "charset" swap at
-    name>encoding over "text/" head? latin1 binary ? or ;
+    ";" split1
+    parse-content-type-attributes "charset" swap at
+    [ name>encoding ]
+    [ dup "text/" head? latin1 binary ? ] if* ;
diff --git a/basis/io/encodings/iana/iana-tests.factor b/basis/io/encodings/iana/iana-tests.factor
index 5ffcc161d4..3175e624ce 100644
--- a/basis/io/encodings/iana/iana-tests.factor
+++ b/basis/io/encodings/iana/iana-tests.factor
@@ -1,5 +1,5 @@
 USING: io.encodings.iana io.encodings.iana.private
-io.encodings.utf8 tools.test assocs ;
+io.encodings.utf8 tools.test assocs namespaces ;
 IN: io.encodings.iana.tests
 
 [ utf8 ] [ "UTF-8" name>encoding ] unit-test
@@ -15,9 +15,9 @@ ebcdic-fisea "EBCDIC-FI-SE-A" register-encoding
 
 ! Clean up after myself
 [ ] [
-    "EBCDIC-FI-SE-A" n>e-table delete-at
-    "csEBCDICFISEA" n>e-table delete-at
-    ebcdic-fisea e>n-table delete-at
+    "EBCDIC-FI-SE-A" n>e-table get delete-at
+    "csEBCDICFISEA" n>e-table get delete-at
+    ebcdic-fisea e>n-table get delete-at
 ] unit-test
 [ "EBCDIC-FI-SE-A" name>encoding ] must-fail
 [ "csEBCDICFISEA" name>encoding ] must-fail