more python3 fixes
This commit is contained in:
parent
0d405cc8d4
commit
120586dd5d
|
@ -23,11 +23,7 @@ from appy.pod.odf_parser import OdfEnvironment
|
|||
from appy.shared import mimeTypesExts
|
||||
from appy.shared.utils import FileWrapper
|
||||
from appy.shared.dav import Resource
|
||||
# The uuid module is there only if python >= 2.5
|
||||
try:
|
||||
import uuid
|
||||
except ImportError:
|
||||
uuid = None
|
||||
import uuid
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
FILE_NOT_FOUND = "'%s' does not exist or is not a file."
|
||||
|
|
|
@ -18,11 +18,8 @@
|
|||
|
||||
# ------------------------------------------------------------------------------
|
||||
import zipfile, shutil, xml.sax, os, os.path, re, mimetypes, time
|
||||
#python3 compat
|
||||
try:
|
||||
from UserDict import UserDict
|
||||
except ImportError:
|
||||
from collections import UserDict
|
||||
from collections import UserDict
|
||||
|
||||
import appy.pod
|
||||
from appy.pod import PodError
|
||||
from appy.shared import mimeTypes, mimeTypesExts
|
||||
|
|
|
@ -18,12 +18,7 @@
|
|||
|
||||
# ------------------------------------------------------------------------------
|
||||
import re, os.path
|
||||
#python3 compat
|
||||
try:
|
||||
from UserDict import UserDict
|
||||
except ImportError:
|
||||
from collections import UserDict
|
||||
|
||||
from collections import UserDict
|
||||
import appy.pod
|
||||
from appy.pod import *
|
||||
from appy.pod.odf_parser import OdfEnvironment, OdfParser
|
||||
|
|
Loading…
Reference in a new issue