woodcoder
diff --git a/‎src/flask_assets.py
Lines changed: 4 additions & 4 deletions b/‎src/flask_assets.py
Lines changed: 4 additions & 4 deletions
diff --git a/‎tests/test_script.py
Lines changed: 18 additions & 20 deletions b/‎tests/test_script.py
Lines changed: 18 additions & 20 deletions
@@ -213,6 +213,7 @@ def init_app(self, app):
     pass
 else:
     import argparse
+    from webassets.script import GenericArgparseImplementation
 
     class CatchAllParser(object):
         def parse_known_args(self, app_args):
@@ -222,8 +223,9 @@ class ManageAssets(script.Command):
         """Manage assets."""
         capture_all_args = True
 
-        def __init__(self, assets_env=None):
+        def __init__(self, assets_env=None, impl=GenericArgparseImplementation):
             self.env = assets_env
+            self.implementation = impl
 
         def create_parser(self, prog):
             return CatchAllParser()
@@ -246,8 +248,6 @@ def run(self, args):
             import sys, os.path
             prog = '%s %s' % (os.path.basename(sys.argv[0]), sys.argv[1])
 
-            from webassets import script
-            return script.GenericArgparseImplementation(
-                self.env, prog=prog).main(args)
+            return self.implementation(self.env, prog=prog).main(args)
 
     __all__ = __all__ + ('ManageAssets',)
@@ -4,6 +4,7 @@
 from nose import SkipTest
 from flask import Flask
 from flask.ext.assets import Environment, ManageAssets
+from webassets.script import GenericArgparseImplementation
 
 try:
     from flaskext.script import Manager
@@ -21,28 +22,25 @@ def test_call(self):
         # Setup the webassets.script with a mock main() function,
         # so we can check whether our call via Flask-Script actually
         # goes through.
-        def dummy_main(argv, *a, **kw):
-            self.last_script_call = argv
-            return 0
-        from webassets import script
-        old_main = script.main
-        script.main = dummy_main
+        test_inst = self
+        class DummyArgparseImplementation(GenericArgparseImplementation):
+            def run_with_argv(self, argv):
+                test_inst.last_script_call = argv
+                return 0
+
+        mgmt = Manager(self.app)
+        mgmt.add_command('assets',
+                ManageAssets(self.env, impl=DummyArgparseImplementation))
 
         try:
-            mgmt = Manager(self.app)
-            mgmt.add_command('assets', ManageAssets(self.env))
-
-            try:
-                # -h is a great test as that is something Flask-Script might
-                # want to claim for itself.
-                sys.argv = ['./manage.py', 'assets', '-h']
-                mgmt.run()
-            except SystemExit:
-                # Always raised, regardless of success or failure of command
-                pass
-            assert self.last_script_call == ['-h']
-        finally:
-            script.main = old_main
+            # -h is a great test as that is something Flask-Script might
+            # want to claim for itself.
+            sys.argv = ['./manage.py', 'assets', '-h']
+            mgmt.run()
+        except SystemExit:
+            # Always raised, regardless of success or failure of command
+            pass
+        assert self.last_script_call == ['-h']
 
     def test_call_auto_env(self):
         """Regression test: Passing the environment to the ManageAssets command