more python3 fixes

This commit is contained in:
Stefan Klug 2015-10-31 20:11:00 +01:00
parent 0d405cc8d4
commit 120586dd5d
3 changed files with 4 additions and 16 deletions

View file

@ -23,11 +23,7 @@ from appy.pod.odf_parser import OdfEnvironment
from appy.shared import mimeTypesExts from appy.shared import mimeTypesExts
from appy.shared.utils import FileWrapper from appy.shared.utils import FileWrapper
from appy.shared.dav import Resource from appy.shared.dav import Resource
# The uuid module is there only if python >= 2.5
try:
import uuid import uuid
except ImportError:
uuid = None
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
FILE_NOT_FOUND = "'%s' does not exist or is not a file." FILE_NOT_FOUND = "'%s' does not exist or is not a file."

View file

@ -18,11 +18,8 @@
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
import zipfile, shutil, xml.sax, os, os.path, re, mimetypes, time 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 import appy.pod
from appy.pod import PodError from appy.pod import PodError
from appy.shared import mimeTypes, mimeTypesExts from appy.shared import mimeTypes, mimeTypesExts

View file

@ -18,12 +18,7 @@
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
import re, os.path import re, os.path
#python3 compat
try:
from UserDict import UserDict
except ImportError:
from collections import UserDict from collections import UserDict
import appy.pod import appy.pod
from appy.pod import * from appy.pod import *
from appy.pod.odf_parser import OdfEnvironment, OdfParser from appy.pod.odf_parser import OdfEnvironment, OdfParser