Cleaned up code around html.escape() in pystache.defaults.

pystache/defaults.py

@@ -9,17 +9,10 @@ does not otherwise specify a value.
 """
 
 try:
-    # Python 3.2 deprecates cgi.escape() and adds the html module as a replacement.
-    import html
-    try:
-        # We also need to verify the existence of the escape() method
-        # due to the following issue:
-        #   http://bugs.python.org/issue14545
-        html.escape
-    except AttributeError:
-        raise ImportError("html.escape does not exist")
+    # Python 3.2 adds html.escape() and deprecates cgi.escape().
+    from html import escape
 except ImportError:
-    import cgi as html
+    from cgi import escape
 
 import os
 import sys
@@ -51,14 +44,14 @@ SEARCH_DIRS = [os.curdir]  # i.e. ['.']
 # rendering templates (e.g. for tags enclosed in double braces).
 # Only unicode strings will be passed to this function.
 #
-# The quote=True argument causes double quotes to be escaped in Python 2,
-# but not single quotes, and both double quotes and single quotes to be
-# escaped in Python 3:
+# The quote=True argument causes double but not single quotes to be escaped
+# in Python 3.1 and earlier, and both double and single quotes to be
+# escaped in Python 3.2 and later:
 #
-#   http://docs.python.org/dev/library/html.html#html.escape
 #   http://docs.python.org/library/cgi.html#cgi.escape
+#   http://docs.python.org/dev/library/html.html#html.escape
 #
-TAG_ESCAPE = lambda u: html.escape(u, quote=True)
+TAG_ESCAPE = lambda u: escape(u, quote=True)
 
 # The default template extension.
 TEMPLATE_EXTENSION = 'mustache'