merge changes from ...

oxutils/html.py

@@ -138,10 +138,6 @@ def decodeHtml(html):
   >>> decodeHtml('me & you and $&%')
   u'me & you and $&%'
   """
-  return htmldecode(html)
-
-def htmldecode(text):
-  """Decode HTML entities in the given text."""
   if type(text) != unicode:
    text = unicode(text)[:]
   if type(text) is unicode:

oxutils/text.py

@@ -10,8 +10,6 @@ def findRe(string, regexp):
     return result[0].strip()
   return ''
 
-findRegexp = findRe
-
 def findString(string, string0='', string1 = ''):
   """Return the string between string0 and string1.