use six to support python 2 and 3

This commit is contained in:
j 2014-09-30 21:04:46 +02:00
commit d4d09b56b6
28 changed files with 1730 additions and 1678 deletions

View file

@ -3,28 +3,32 @@
# GPL 2011
__version__ = '2.1.1'
import cache
import js
import jsonc
import net
import srt
import utils
from . import cache
from . import js
from . import jsonc
from . import net
from . import srt
from . import utils
from api import *
from file import *
from form import *
from format import *
from geo import *
from html import *
from .api import *
from .file import *
from .form import *
from .format import *
from .geo import *
from .html import *
#image depends on PIL, not easy enough to instal on osx
try:
from image import *
from .image import *
except:
pass
from location import *
from movie import *
from normalize import *
from oembed import *
from text import *
from torrent import *
from fixunicode import *
from .location import *
from .movie import *
from .normalize import *
from .oembed import *
from .text import *
#currently broken in python3
try:
from .torrent import *
except:
pass
from .fixunicode import *