From 73c140c98a08995123108ada745c599aa42c36ef Mon Sep 17 00:00:00 2001 From: j Date: Wed, 7 May 2008 11:48:31 +0200 Subject: [PATCH] remove outdated api, update setup.py --- oxutils/html.py | 4 ---- oxutils/text.py | 3 --- setup.py | 13 ++++++++----- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/oxutils/html.py b/oxutils/html.py index 818b498..7f2a380 100644 --- a/oxutils/html.py +++ b/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: diff --git a/oxutils/text.py b/oxutils/text.py index c36ffa9..f6eb165 100644 --- a/oxutils/text.py +++ b/oxutils/text.py @@ -10,9 +10,6 @@ def findRe(string, regexp): return result[0].strip() return None -def findRegexp(string, regexp): - return findRe(string, regexp) - def findString(string, string0='', string1 = ''): """Return the string between string0 and string1. diff --git a/setup.py b/setup.py index f1b2222..f9324af 100644 --- a/setup.py +++ b/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 = [