[Pymoul-svn] SF.net SVN: pymoul: [187] pymoul/trunk

[<ti...@us...>]

Revision: 187
          http://pymoul.svn.sourceforge.net/pymoul/?rev=187&view=rev
Author:   tiran
Date:     2007-02-23 08:41:50 -0800 (Fri, 23 Feb 2007)

Log Message:
-----------
Import order fixed

Modified Paths:
--------------
    pymoul/trunk/src/moul/crypt/binary.py
    pymoul/trunk/src/moul/crypt/binaryrecord.py
    pymoul/trunk/src/moul/crypt/whatdoyousee.py
    pymoul/trunk/src/moul/crypt/xtea.py
    pymoul/trunk/src/moul/file/chatlog.py
    pymoul/trunk/src/moul/file/directory.py
    pymoul/trunk/src/moul/file/kiimage.py
    pymoul/trunk/src/moul/file/localization.py
    pymoul/trunk/src/moul/file/plasmalog.py
    pymoul/trunk/src/moul/file/utils.py
    pymoul/trunk/src/moul/file/wdysini.py
    pymoul/trunk/src/moul/log.py
    pymoul/trunk/src/moul/osdependent/processinfo.py
    pymoul/trunk/src/moul/osdependent/tests/test_processinfo.py
    pymoul/trunk/src/moul/qt/dninumbers.py
    pymoul/trunk/src/moul/qt/errorhandler.py
    pymoul/trunk/src/moul/qt/i18n/__init__.py
    pymoul/trunk/src/moul/qt/localization.py
    pymoul/trunk/src/moul/qt/mainwindow.py
    pymoul/trunk/src/moul/qt/moulqt.py
    pymoul/trunk/src/moul/qt/utils.py
    pymoul/trunk/src/moul/qt/wdysini.py
    pymoul/trunk/src/moul/time/cavern.py
    pymoul/trunk/src/moul/time/dni.py
    pymoul/trunk/src/moul/time/utils.py
    pymoul/trunk/utilities/importorder.py

Modified: pymoul/trunk/src/moul/crypt/binary.py
===================================================================
--- pymoul/trunk/src/moul/crypt/binary.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/src/moul/crypt/binary.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -21,9 +21,9 @@
 __version__ = "$Id"
 __revision__ = "$Revision"
 
+from struct import calcsize
 from struct import pack
 from struct import unpack
-from struct import calcsize
 
 from moul.crypt.binaryrecord import parseRecord
 from moul.crypt.binaryrecord import registerRecord

Modified: pymoul/trunk/src/moul/crypt/binaryrecord.py
===================================================================
--- pymoul/trunk/src/moul/crypt/binaryrecord.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/src/moul/crypt/binaryrecord.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -25,9 +25,9 @@
 __version__ = "$Id"
 __revision__ = "$Revision"
 
+from struct import calcsize
 from struct import pack
 from struct import unpack
-from struct import calcsize
 
 _marker = object()
 

Modified: pymoul/trunk/src/moul/crypt/whatdoyousee.py
===================================================================
--- pymoul/trunk/src/moul/crypt/whatdoyousee.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/src/moul/crypt/whatdoyousee.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -29,11 +29,11 @@
 __revision__ = "$Revision$"
 
 import struct
+from logging import getLogger
 
+from moul.crypt.binary import BinaryFile
 from moul.crypt.xtea import xtea_decrypt
 from moul.crypt.xtea import xtea_encrypt
-from moul.crypt.binary import BinaryFile
-from logging import getLogger
 
 
 HEADER = "whatdoyousee"

Modified: pymoul/trunk/src/moul/crypt/xtea.py
===================================================================
--- pymoul/trunk/src/moul/crypt/xtea.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/src/moul/crypt/xtea.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -36,10 +36,10 @@
     >>> crypt('0123456789012345',z,iv)
     'Hello There'
 
-""" 
-
+"""
 import struct
 
+
 def crypt(key,data,iv='\00\00\00\00\00\00\00\00',n=32,endian="!"):
     """
         Encrypt/decrypt variable length string using XTEA cypher as

Modified: pymoul/trunk/src/moul/file/chatlog.py
===================================================================
--- pymoul/trunk/src/moul/file/chatlog.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/src/moul/file/chatlog.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -35,11 +35,11 @@
 import os
 import re
 from fnmatch import fnmatch
+from logging import getLogger
 from shutil import move
 from time import localtime
 
 from moul.file.utils import fileModTime
-from logging import getLogger
 
 
 RE_FLAGS = re.LOCALE

Modified: pymoul/trunk/src/moul/file/directory.py
===================================================================
--- pymoul/trunk/src/moul/file/directory.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/src/moul/file/directory.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -22,6 +22,7 @@
 __revision__ = "$Revision$"
 
 import os
+from logging import getLogger
 
 from moul.file.chatlog import ChatlogDirectoryView
 from moul.file.chatlog import ChatlogMover
@@ -30,7 +31,6 @@
 from moul.file.plasmalog import PlasmalogZipper
 from moul.file.wdysini import AudioIni
 from moul.file.wdysini import GraphicsIni
-from logging import getLogger
 
 
 LOG = getLogger('moul.file.directory')

Modified: pymoul/trunk/src/moul/file/kiimage.py
===================================================================
--- pymoul/trunk/src/moul/file/kiimage.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/src/moul/file/kiimage.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -26,11 +26,11 @@
 import struct
 import tempfile
 from fnmatch import fnmatch
+from logging import getLogger
+
 from moul.file.utils import fileModTime
 from moul.file.utils import fileSize
 
-from logging import getLogger
-
 KINUMBER_RE = re.compile("(\d+)\.jpg$", re.IGNORECASE)
 JPEG_HEADER = "\377\330\377"
 

Modified: pymoul/trunk/src/moul/file/localization.py
===================================================================
--- pymoul/trunk/src/moul/file/localization.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/src/moul/file/localization.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -20,14 +20,13 @@
 from __future__ import with_statement
 import glob
 import os
+from logging import getLogger
 from sgmllib import SGMLParser
 from xml.sax import ContentHandler
 from xml.sax import make_parser
 from xml.sax.handler import feature_namespaces
 from xml.sax.saxutils import unescape
 
-from logging import getLogger
-
 __author__ = "Christian Heimes"
 __version__ = "$Id$"
 __revision__ = "$Revision$"

Modified: pymoul/trunk/src/moul/file/plasmalog.py
===================================================================
--- pymoul/trunk/src/moul/file/plasmalog.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/src/moul/file/plasmalog.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -25,11 +25,11 @@
 import time
 import zipfile
 from fnmatch import fnmatch
+from logging import getLogger
 from stat import ST_MTIME
 
 from moul.crypt.elf import decryptElf
 from moul.file.utils import fileModTime
-from logging import getLogger
 
 
 PLASMA_LOG = "plasmalog.txt"

Modified: pymoul/trunk/src/moul/file/utils.py
===================================================================
--- pymoul/trunk/src/moul/file/utils.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/src/moul/file/utils.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -28,6 +28,7 @@
 from stat import ST_MTIME
 from stat import ST_SIZE
 
+
 def fileModTime(path, format=None):
     """Get modification time of file
     

Modified: pymoul/trunk/src/moul/file/wdysini.py
===================================================================
--- pymoul/trunk/src/moul/file/wdysini.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/src/moul/file/wdysini.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -23,10 +23,10 @@
 
 import os
 import shutil
+from logging import getLogger
 
 from moul.crypt.whatdoyousee import decryptWDYS
 from moul.crypt.whatdoyousee import encryptWDYS
-from logging import getLogger
 
 
 LOG = getLogger('moul.file.wdysini')

Modified: pymoul/trunk/src/moul/log.py
===================================================================
--- pymoul/trunk/src/moul/log.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/src/moul/log.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -23,8 +23,6 @@
 __version__ = "$Id$"
 __revision__ = "$Revision$"
 
-__all__ = ['LOG', 'getLogger', 'signalLogDecorator']
-
 import logging
 import os
 import platform
@@ -35,6 +33,7 @@
 
 from moul.metadata import __version__ as moul_version
 
+
 LOG = logging.getLogger('pyMoul')
 
 class LoggingStdout(object):

Modified: pymoul/trunk/src/moul/osdependent/processinfo.py
===================================================================
--- pymoul/trunk/src/moul/osdependent/processinfo.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/src/moul/osdependent/processinfo.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -53,7 +53,6 @@
 import sys
 from logging import getLogger
 
-
 LOG = getLogger("processinfo")
 
 _plat = sys.platform.startswith

Modified: pymoul/trunk/src/moul/osdependent/tests/test_processinfo.py
===================================================================
--- pymoul/trunk/src/moul/osdependent/tests/test_processinfo.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/src/moul/osdependent/tests/test_processinfo.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -24,7 +24,7 @@
 import unittest
 from doctest import DocTestSuite
 
-import moul.osdependent.processinfo 
+import moul.osdependent.processinfo
 
 
 def test_suite():

Modified: pymoul/trunk/src/moul/qt/dninumbers.py
===================================================================
--- pymoul/trunk/src/moul/qt/dninumbers.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/src/moul/qt/dninumbers.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -34,18 +34,19 @@
 from logging import getLogger
 
 from moul.time.cavern import CavernTime
+from moul.time.dni import DNI_HOLIDAYS
 from moul.time.dni import DniTime
 from moul.time.dni import FACTOR_SP
+from moul.time.dni import VAILEETEE
 from moul.time.dni import decimal2dni
-from moul.time.dni import VAILEETEE
-from moul.time.dni import DNI_HOLIDAYS
 from moul.time.utils import utcnow
+
 from moul.qt.utils import QNamespaceContainer
 from moul.qt.utils import QSignalLoggerMetaclass
-from moul.qt.utils import skipLogging
 from moul.qt.utils import QTimerThreadlet
 from moul.qt.utils import dt2qdt
 from moul.qt.utils import qdt2dt
+from moul.qt.utils import skipLogging
 
 
 NUMBER_HEIGHT = 25

Modified: pymoul/trunk/src/moul/qt/errorhandler.py
===================================================================
--- pymoul/trunk/src/moul/qt/errorhandler.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/src/moul/qt/errorhandler.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -29,9 +29,9 @@
 import os
 import sys
 from PyQt4.QtGui import QApplication
+from logging import getLogger
 from traceback import format_exception
 
-from logging import getLogger
 from moul.qt.utils import criticalMB
 
 

Modified: pymoul/trunk/src/moul/qt/i18n/__init__.py
===================================================================
--- pymoul/trunk/src/moul/qt/i18n/__init__.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/src/moul/qt/i18n/__init__.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -89,7 +89,7 @@
     if qm is None:
         qm = loadTranslationFile(shortname)
         if qm is None:
-            if lang != 'en':
+            if lang not in ('en', 'C'):
                 LOG.warning("No translation found!")
         else:
             LOG.info("Loading translation %s" % shortname)
@@ -97,6 +97,5 @@
         LOG.info("Loading translation %s" % longname)
 
     if qm is not None:
-        LOG.debug("len(%i), type(%s)" % (len(qm), type(qm)))
         translator.load(qm, len(qm))
         app.installTranslator(translator)

Modified: pymoul/trunk/src/moul/qt/localization.py
===================================================================
--- pymoul/trunk/src/moul/qt/localization.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/src/moul/qt/localization.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -29,14 +29,14 @@
 from PyQt4.QtCore import Qt
 from PyQt4.QtCore import SIGNAL
 from PyQt4.QtCore import pyqtSignature
+from logging import getLogger
 
 from moul.file.localization import translationRegistry as tr
-from logging import getLogger
 
 from moul.qt.simpleprogressbar import SimpleProgressbar
-from moul.qt.utils import QYieldingThreadlet
 from moul.qt.utils import QNamespaceContainer
 from moul.qt.utils import QSignalLoggerMetaclass
+from moul.qt.utils import QYieldingThreadlet
 
 LOG = getLogger('moul.loc')
 

Modified: pymoul/trunk/src/moul/qt/mainwindow.py
===================================================================
--- pymoul/trunk/src/moul/qt/mainwindow.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/src/moul/qt/mainwindow.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -18,39 +18,38 @@
 
 """Moul QT GUI main windows
 """
-from __future__ import with_statement
-
 __author__ = "Christian Heimes"
 __version__ = "$Id$"
 __revision__ = "$Revision$"
 
 import os
+import sys
 from PyQt4 import QtCore
 from PyQt4 import QtGui
 from PyQt4.QtCore import Qt
 from PyQt4.QtCore import SIGNAL
 from PyQt4.QtCore import pyqtSignature
-import sys
+from logging import getLogger
 
 from moul import metadata
 from moul.config import lookupDir
 from moul.file.directory import UruGameDataDirectory
 from moul.file.directory import UruPersonalDataDirectory
-from logging import getLogger
 from moul.osdependent import isMoulRunning
 from moul.server.ping import ServerList
-from moul.server.ping import isSocketError
 from moul.server.ping import fmtSocketError
+from moul.server.ping import isSocketError
 
+from moul.qt import utils as qtutils
 from moul.qt.dninumbers import DniTimeNumberContainer
 from moul.qt.localization import LocalizationContainer
-from moul.qt.wdysini import IniFileContainer
 from moul.qt.simpleprogressbar import SimpleProgressbar
-from moul.qt.utils import QYieldingThreadlet
-from moul.qt.utils import QThreadlet
 from moul.qt.ui.mainwindow import Ui_MainWindow
-from moul.qt import utils as qtutils
+from moul.qt.utils import QThreadlet
+from moul.qt.utils import QYieldingThreadlet
+from moul.qt.wdysini import IniFileContainer
 
+
 LOG = getLogger('moul.qt')
 
 class MainWindow(QtGui.QMainWindow, Ui_MainWindow):

Modified: pymoul/trunk/src/moul/qt/moulqt.py
===================================================================
--- pymoul/trunk/src/moul/qt/moulqt.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/src/moul/qt/moulqt.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -23,21 +23,22 @@
 __version__ = "$Id$"
 __revision__ = "$Revision$"
 
-from moul.log import createLogfile
-
 import sys
 from PyQt4 import QtGui
 from logging import getLogger
 
+import moul.log # initialize log handler
+
 from moul.config import getPyMoulDataDir
+from moul.log import createLogfile
 from moul.osdependent import isMoulRunning
 from moul.osdependent.singleapp import SimpleSingleApp
 
 from moul.qt.errorhandler import criticalMB
 from moul.qt.errorhandler import removeQtExceptHook
 from moul.qt.errorhandler import setupQtExceptHook
+from moul.qt.i18n import installTranslator
 from moul.qt.mainwindow import MainWindow
-from moul.qt.i18n import installTranslator
 
 
 LOG = getLogger('moul.qt')

Modified: pymoul/trunk/src/moul/qt/utils.py
===================================================================
--- pymoul/trunk/src/moul/qt/utils.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/src/moul/qt/utils.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -35,16 +35,16 @@
 import re
 import sip
 import warnings
+from PyQt4 import QtCore
+from PyQt4 import QtGui
 from PyQt4.QtCore import SIGNAL
-from PyQt4 import QtGui
-from PyQt4 import QtCore
 from datetime import datetime
+from types import FunctionType
 from types import UnboundMethodType
-from types import FunctionType
 
 from moul.osdependent import __FROZEN__
+from moul.time.utils import UTC
 from moul.time.utils import normalizeTZ
-from moul.time.utils import UTC
 
 
 LOG = logging.getLogger('moul.qt.utils')

Modified: pymoul/trunk/src/moul/qt/wdysini.py
===================================================================
--- pymoul/trunk/src/moul/qt/wdysini.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/src/moul/qt/wdysini.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -18,8 +18,6 @@
 
 """Moul QT GUI main windows
 """
-from __future__ import with_statement
-
 __author__ = "Christian Heimes"
 __version__ = "$Id$"
 __revision__ = "$Revision$"
@@ -30,18 +28,20 @@
 from PyQt4.QtCore import Qt
 from PyQt4.QtCore import SIGNAL
 from PyQt4.QtCore import pyqtSignature
+from logging import getLogger
 
 from moul import metadata
 from moul.config import lookupDir
 from moul.file.directory import UruGameDataDirectory
 from moul.file.directory import UruPersonalDataDirectory
 from moul.file.wdysini import videoModes
-from logging import getLogger
+
 from moul.qt.utils import QNamespaceContainer
 from moul.qt.utils import QSignalLoggerMetaclass
+from moul.qt.utils import criticalMB
 from moul.qt.utils import questionMB
-from moul.qt.utils import criticalMB
 
+
 LOG = getLogger('moul.qt')
 
 class IniFileContainer(QNamespaceContainer):

Modified: pymoul/trunk/src/moul/time/cavern.py
===================================================================
--- pymoul/trunk/src/moul/time/cavern.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/src/moul/time/cavern.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -25,13 +25,13 @@
 
 from datetime import datetime
 
+from moul.time.utils import UNIX_0
+from moul.time.utils import UTC
 from moul.time.utils import diffTD
 from moul.time.utils import normalizeTZ
 from moul.time.utils import td2sec
 from moul.time.utils import timezone
 from moul.time.utils import utcnow
-from moul.time.utils import UNIX_0
-from moul.time.utils import UTC
 
 ## not used in the current version
 #SUPPORTED_TZ = ('America', 'Canada', 'Etc', 'Europe', 'US')

Modified: pymoul/trunk/src/moul/time/dni.py
===================================================================
--- pymoul/trunk/src/moul/time/dni.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/src/moul/time/dni.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -84,15 +84,15 @@
 __version__ = "$Id$"
 __revision__ = "$Revision$"
 
+import sys
 from datetime import datetime
 from time import mktime
-import sys
 
+from moul.time.utils import UNIX_0
+from moul.time.utils import UTC
 from moul.time.utils import td2sec
 from moul.time.utils import timezone
 from moul.time.utils import utcnow
-from moul.time.utils import UNIX_0
-from moul.time.utils import UTC
 
 # list of month names with approx. dates
 VAILEETEE = (

Modified: pymoul/trunk/src/moul/time/utils.py
===================================================================
--- pymoul/trunk/src/moul/time/utils.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/src/moul/time/utils.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -21,17 +21,19 @@
 __version__ = "$Id$"
 __revision__ = "$Revision$"
 
+from datetime import datetime
+from logging import getLogger
+
 from moul.osdependent import __FROZEN__
+
 # pytz is an egg
 if not __FROZEN__:
     import pkg_resources
     pkg_resources.require("pytz>=2006p")
 
-from datetime import datetime
-from logging import getLogger
+from pytz import common_timezones
+from pytz import timezone
 from pytz import utc as UTC
-from pytz import timezone
-from pytz import common_timezones
 
 
 LOG = getLogger('timeutils')

Modified: pymoul/trunk/utilities/importorder.py
===================================================================
--- pymoul/trunk/utilities/importorder.py	2007-02-23 15:19:19 UTC (rev 186)
+++ pymoul/trunk/utilities/importorder.py	2007-02-23 16:41:50 UTC (rev 187)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.4
+#!/usr/bin/env python2.5
 ##############################################################################
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
@@ -119,9 +119,14 @@
     imp_list = filterList(import_list, 'import ')
     from_list = filterList(import_list, 'from ')
 
+    #remove future statements from from_list
+    future_list = filterList(from_list, 'from __future__ import')
+    from_list = removeList(from_list, future_list)
+
     #extracting non import content
     non_import_block = removeList(import_list, imp_list)
     non_import_block = removeList(non_import_block, from_list)
+    non_import_block = removeList(non_import_block, future_list)
     non_import_block_fmt = formateBlock(non_import_block)
 
     #comma separated imports into individual import statements
@@ -145,7 +150,8 @@
     global_from_list = removeList(rem_from_list1, zope_from_list)
 
     #formating the global, zope and zope.app package imports
-    format_import_content = mergeAllBlocks(global_imp_list,
+    format_import_content = mergeAllBlocks(future_list,
+                                           global_imp_list,
                                            zope_imp_list,
                                            zope_app_imp_list,
                                            global_from_list,
@@ -158,6 +164,7 @@
         non_import_block_fmt += '\n\n'
 
     fmt_content = format_import_content + non_import_block_fmt
+    fmt_content = fmt_content.strip() + '\n'
 
     return {'import_order':fmt_content,
             'non_import_order':import_content}
@@ -253,16 +260,20 @@
     return [item for item in list
             if item not in rem_list]
 
-def mergeAllBlocks(global_imp_list, zope_imp_list, zope_app_imp_list,
-                   global_from_list, zope_from_list, zope_app_from_list):
+def mergeAllBlocks(future_list, global_imp_list, zope_imp_list,
+                   zope_app_imp_list, global_from_list, zope_from_list,
+                   zope_app_from_list):
     """merges global, zope and zope.app imports """
     import_block = ''
+    future_block = formateBlock(future_list)
     global_imp_block = formateBlock(global_imp_list)
     global_from_block = formateBlock(global_from_list)
     zope_imp_block = formateBlock(zope_imp_list)
     zope_from_block = formateBlock(zope_from_list)
     zope_app_imp_block = formateBlock(zope_app_imp_list)
     zope_app_from_block = formateBlock(zope_app_from_list)
+    
+    import_block = future_block
 
     import_block += formatsFromAndImportBlock(global_imp_block,
                                               global_from_block)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.