diff --git a/appy/pod/doc_importers.py b/appy/pod/doc_importers.py index 4f1f366..3517f22 100644 --- a/appy/pod/doc_importers.py +++ b/appy/pod/doc_importers.py @@ -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." diff --git a/appy/pod/renderer.py b/appy/pod/renderer.py index 354b77d..cb05aac 100644 --- a/appy/pod/renderer.py +++ b/appy/pod/renderer.py @@ -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 diff --git a/appy/pod/styles_manager.py b/appy/pod/styles_manager.py index bfe026e..526e7f1 100644 --- a/appy/pod/styles_manager.py +++ b/appy/pod/styles_manager.py @@ -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