separating test_shell and test_api, replacing shell hacks with ScriptTest

3 files changed, 17 insertions, 1 deletions

diff --git a/migrate/__init__.pyc b/migrate/__init__.pyc
deleted file mode 100644
index 26f737f..0000000
--- a/migrate/__init__.pyc
+++ /dev/null
diff --git a/migrate/versioning/genmodel.py b/migrate/versioning/genmodel.py
index ba455b0..114d985 100644
--- a/migrate/versioning/genmodel.py
+++ b/migrate/versioning/genmodel.py
@@ -140,7 +140,7 @@ class ModelGenerator(object):
             upgradeCommands.append("%(table)s.create()" % {'table': tableName})
             downgradeCommands.append("%(table)s.drop()" % {'table': tableName})
 
-        pre_command = 'meta.bind(migrate_engine)'
+        pre_command = '    meta.bind = migrate_engine'
 
         return (
             '\n'.join(decls),
diff --git a/migrate/versioning/util/__init__.py b/migrate/versioning/util/__init__.py
index f5f8edc..70370ac 100644
--- a/migrate/versioning/util/__init__.py
+++ b/migrate/versioning/util/__init__.py
@@ -130,3 +130,19 @@ def construct_engine(engine, **opts):
             kwargs[key[11:]] = guess_obj_type(value)
     
     return create_engine(engine, **kwargs)
+
+
+class Memoize:
+    """Memoize(fn) - an instance which acts like fn but memoizes its arguments
+       Will only work on functions with non-mutable arguments
+
+       ActiveState Code 52201
+    """
+    def __init__(self, fn):
+        self.fn = fn
+        self.memo = {}
+
+    def __call__(self, *args):
+        if not self.memo.has_key(args):
+            self.memo[args] = self.fn(*args)
+        return self.memo[args]