replace calls to aspen.utils.ascii_dammit()

That function has been removed in AspenWeb/aspen.py#20
AspenWeb · Aug 9, 2016 · d911de6 · d911de6
1 parent 7b08464
commit d911de6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/pando/__init__.py b/pando/__init__.py
@@ -59,6 +59,9 @@
 import sys
 import pkg_resources
 
+import aspen.utils as _x  # this registers the 'repr' codec error strategy
+del _x
+
 # imports of convenience
 from aspen.simplates import json_ as json
 from aspen.simplates.renderers import BUILTIN_RENDERERS, RENDERERS

diff --git a/pando/http/request.py b/pando/http/request.py
@@ -43,7 +43,6 @@
 import urlparse
 
 from aspen.http.request import Path as _Path, Querystring as _Querystring
-from aspen.utils import ascii_dammit
 
 from .. import Response
 from .baseheaders import BaseHeaders
@@ -402,7 +401,7 @@ def __new__(cls, raw):
                     #
                     #  http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
 
-                    safe = ascii_dammit(raw)
+                    safe = raw.decode('ascii', 'repr')
                     raise Response(501, "Your request-method violates RFC "
                                         "2616: %s" % safe)
 
@@ -498,7 +497,7 @@ class Version(unicode):
     def __new__(cls, raw):
         version = versions.get(raw, None)
         if version is None: # fast for 99.999999% case
-            safe = ascii_dammit(raw)
+            safe = raw.decode('ascii', 'repr')
             if version_re.match(raw) is None:
                 raise Response(400, "Bad HTTP version: %s." % safe)
             else:

diff --git a/pando/http/response.py b/pando/http/response.py
@@ -12,8 +12,6 @@
 import re
 import sys
 
-from aspen.utils import ascii_dammit
-
 from . import status_strings
 from .baseheaders import BaseHeaders as Headers
 
@@ -97,14 +95,14 @@ def __call__(self, environ, start_response):
             try:        # XXX This is a hack. It's red hot, baby.
                 k = k.encode('US-ASCII')
             except UnicodeEncodeError:
-                k = ascii_dammit(k)
-                raise ValueError("Header key %s must be US-ASCII.")
+                k = k.decode('US-ASCII', 'repr')
+                raise ValueError("Header key %s isn't US-ASCII." % k)
             for v in vals:
                 try:    # XXX This also is a hack. It is also red hot, baby.
                     v = v.encode('US-ASCII')
                 except UnicodeEncodeError:
-                    v = ascii_dammit(v)
-                    raise ValueError("Header value %s must be US-ASCII.")
+                    v = v.decode('US-ASCII', 'repr')
+                    raise ValueError("Header value %s isn't US-ASCII." % k)
                 wsgi_headers.append((k, v))
 
         start_response(wsgi_status, wsgi_headers)