Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop

This commit is contained in:
Lance Stout 2012-01-10 20:05:25 -08:00
commit a79ce1c35e

View file

@ -8,6 +8,7 @@
# file, which you should have received as part of this distribution. # file, which you should have received as part of this distribution.
import sys import sys
import codecs
try: try:
from setuptools import setup, Command from setuptools import setup, Command
except ImportError: except ImportError:
@ -31,7 +32,7 @@ from sleekxmpp.version import __version__
VERSION = __version__ VERSION = __version__
DESCRIPTION = 'SleekXMPP is an elegant Python library for XMPP (aka Jabber, Google Talk, etc).' DESCRIPTION = 'SleekXMPP is an elegant Python library for XMPP (aka Jabber, Google Talk, etc).'
with open('README.rst') as readme: with codecs.open('README.rst', 'r', encoding='UTF-8') as readme:
LONG_DESCRIPTION = ''.join(readme) LONG_DESCRIPTION = ''.join(readme)
CLASSIFIERS = [ 'Intended Audience :: Developers', CLASSIFIERS = [ 'Intended Audience :: Developers',