Changeset 1156 for trunk

Timestamp:

Mar 18, 2011, 10:05:58 AM (13 years ago)

Author:

hodgestar

Message:

Merge r1139 from py3k: add compatibility functions for dealing with python 3; factor existing compatibility functions out from genshi utils.

Location:

trunk

Files:

• . (modified) (1 prop)
• genshi/compat.py (copied) (copied from branches/experimental/py3k/genshi/compat.py)
• genshi/util.py (modified) (2 diffs)

trunk/genshi/util.py

@@ -16 +16 @@
 import htmlentitydefs as entities
 import re
+
+from compat import any, all, stringrepr
 
 __docformat__ = 'restructuredtext en'
@@ -247 +249 @@
     return _STRIPTAGS_RE.sub('', text)
 
-
-def stringrepr(string):
-    ascii = string.encode('ascii', 'backslashreplace')
-    quoted = "'" +  ascii.replace("'", "\\'") + "'"
-    if len(ascii) > len(string):
-        return 'u' + quoted
-    return quoted
-
-
-# Compatibility fallback implementations for older Python versions
-
-try:
-    all = all
-    any = any
-except NameError:
-    def any(S):
-        for x in S:
-            if x:
-               return True
-        return False
-
-    def all(S):
-        for x in S:
-            if not x:
-               return False
-        return True