#OSQA-574, a bit of backwards compatibility, importing the with_statements from the...

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@915 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum_modules/exporter/exporter.py b/forum_modules/exporter/exporter.py
index f23538e43f44d2cec8078584eef7e65988916cdd..49f89da34941e75f7e80f90e1064801846b29446 100644 (file)
--- a/forum_modules/exporter/exporter.py
+++ b/forum_modules/exporter/exporter.py
@@ -1,3 +1,5 @@
+from __future__ import with_statement
+

 import os, tarfile, datetime, logging, re, ConfigParser, shutil, zipfile
 
 from django.core.cache import cache
 import os, tarfile, datetime, logging, re, ConfigParser, shutil, zipfile
 
 from django.core.cache import cache


@@ -12,12 +14,6 @@ from forum import settings
 from django.conf import settings as djsettings
 import settings as selfsettings
 
 from django.conf import settings as djsettings
 import settings as selfsettings
 

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

 CACHE_KEY = "%s_exporter_state" % APP_URL
 EXPORT_STEPS = []
 
 CACHE_KEY = "%s_exporter_state" % APP_URL
 EXPORT_STEPS = []
 

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

diff --git a/forum_modules/exporter/views.py b/forum_modules/exporter/views.py
index 856017908dcd1509e3691ab0972ea19e1c7d6512..edbeedc083ae80e6977e027099dd0cfb17d61f91 100644 (file)
--- a/forum_modules/exporter/views.py
+++ b/forum_modules/exporter/views.py
@@ -1,3 +1,5 @@
+from __future__ import with_statement
+

 import os, tarfile, ConfigParser, datetime
 
 from StringIO import StringIO
 import os, tarfile, ConfigParser, datetime
 
 from StringIO import StringIO


@@ -16,13 +18,6 @@ from forum import settings
 from exporter import export, CACHE_KEY, EXPORT_STEPS, DATE_AND_AUTHOR_INF_SECTION, DATETIME_FORMAT
 from importer import start_import
 
 from exporter import export, CACHE_KEY, EXPORT_STEPS, DATE_AND_AUTHOR_INF_SECTION, DATETIME_FORMAT
 from importer import start_import
 

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

 @admin_tools_page(_('exporter'), _('XML data export'))
 def exporter(request):
     state = cache.get(CACHE_KEY)
 @admin_tools_page(_('exporter'), _('XML data export'))
 def exporter(request):
     state = cache.get(CACHE_KEY)