0x2620/python-oxlib
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge changes from ...

Browse source
This commit is contained in:
Rolux 2008-05-07 13:35:54 +02:00
commit dc56e05b3f
3 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
oxutils/html.py
View file

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

2
oxutils/text.py
View file

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

13
setup.py
View file

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