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. 
 

setup.py

@@ -8,13 +8,16 @@ setup(
   version="0.1",
 
   description="collection of utils used to work with python",
-  author="ox",
-  author_email="utils@0xdb.org",
-  url="http://code.0xdb.org/python-oxutils",
-  download_url="http://code.0xdb.org/python-oxutils/download",
-  license="GPL",
+  author="0x",
+  author_email="code@0xdb.org",
+  url="http://code.0xdb.org/oxutils",
+  download_url="http://code.0xdb.org/oxutils/download",
+  license="GPLv3",
   packages=find_packages(),
   zip_safe=False,
+  install_requires=[
+        'chardet',
+  ],
   keywords = [
   ],
   classifiers = [