Merge branch 'threadsafe_requestholder' into update_django

[osqa.git] / forum_modules / exporter / importer.py

diff --git a/forum_modules/exporter/importer.py b/forum_modules/exporter/importer.py
index 1519a44f9e6b2d6d134702cf82a90294535eb54e..c6b60ab0e78a7e1e9042eaa6ce7f38c746baf8c1 100644 (file)
--- a/forum_modules/exporter/importer.py
+++ b/forum_modules/exporter/importer.py
@@ -1,3 +1,5 @@
+from __future__ import with_statement
+

 import os, tarfile, datetime, ConfigParser, logging
 
 from django.utils.translation import ugettext as _
 import os, tarfile, datetime, ConfigParser, logging
 
 from django.utils.translation import ugettext as _


@@ -14,12 +16,6 @@ from exporter import TMP_FOLDER, DATETIME_FORMAT, DATE_FORMAT, META_INF_SECTION,
 from orm import orm
 import commands, settings
 
 from orm import orm
 import commands, settings
 

-# Try to import the with statement
-try:
-    from __future__ import with_statement
-except:
-    pass
-

 NO_DEFAULT = object()
 
 import string
 NO_DEFAULT = object()
 
 import string