Merge branch 'for-pr-omitsix' of https://github.com/masayuko/python-feedgen
Signed-off-by: Lars Kiesow <lkiesow@uos.de>
This commit is contained in:
commit
eca772f0b6
4 changed files with 10 additions and 3 deletions
7
feedgen/compat.py
Normal file
7
feedgen/compat.py
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
import sys
|
||||||
|
if sys.version_info[0] >= 3:
|
||||||
|
string_types = str
|
||||||
|
else:
|
||||||
|
string_types = basestring
|
|
@ -13,7 +13,7 @@ from datetime import datetime
|
||||||
import dateutil.parser
|
import dateutil.parser
|
||||||
import dateutil.tz
|
import dateutil.tz
|
||||||
from feedgen.util import ensure_format
|
from feedgen.util import ensure_format
|
||||||
from six import string_types
|
from feedgen.compat import string_types
|
||||||
|
|
||||||
|
|
||||||
class FeedEntry(object):
|
class FeedEntry(object):
|
||||||
|
|
|
@ -17,7 +17,7 @@ from feedgen.entry import FeedEntry
|
||||||
from feedgen.util import ensure_format
|
from feedgen.util import ensure_format
|
||||||
import feedgen.version
|
import feedgen.version
|
||||||
import sys
|
import sys
|
||||||
from six import string_types
|
from feedgen.compat import string_types
|
||||||
|
|
||||||
|
|
||||||
_feedgen_version = feedgen.version.version_str
|
_feedgen_version = feedgen.version.version_str
|
||||||
|
|
2
setup.py
2
setup.py
|
@ -14,7 +14,7 @@ setup(
|
||||||
url = 'http://lkiesow.github.io/python-feedgen',
|
url = 'http://lkiesow.github.io/python-feedgen',
|
||||||
keywords = ['feed','ATOM','RSS','podcast'],
|
keywords = ['feed','ATOM','RSS','podcast'],
|
||||||
license = 'FreeBSD and LGPLv3+',
|
license = 'FreeBSD and LGPLv3+',
|
||||||
install_requires = ['lxml', 'dateutils', 'six'],
|
install_requires = ['lxml', 'dateutils'],
|
||||||
classifiers = [
|
classifiers = [
|
||||||
'Development Status :: 4 - Beta',
|
'Development Status :: 4 - Beta',
|
||||||
'Development Status :: 5 - Production/Stable',
|
'Development Status :: 5 - Production/Stable',
|
||||||
|
|
Loading…
Reference in a new issue