samba.netcmd: Pass in outf/errf.

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Wed Nov  2 20:09:40 CET 2011 on sn-devel-104

diff --git a/source4/scripting/python/samba/netcmd/__init__.py b/source4/scripting/python/samba/netcmd/__init__.py
index bf0845726cc9a8b07c430371d4a090130b73bdb4..58353a07f4686a3c20d411814f205d056d76a959 100644 (file)
--- a/source4/scripting/python/samba/netcmd/__init__.py
+++ b/source4/scripting/python/samba/netcmd/__init__.py
@@ -30,7 +30,6 @@ class Option(optparse.Option):
     pass
 
 
-
 class Command(object):
     """A samba-tool command."""
 
@@ -63,8 +62,10 @@ class Command(object):
         "credopts": options.CredentialsOptions,
         "versionopts": options.VersionOptions,
         }
-    outf = sys.stdout
-    errf = sys.stderr
+
+    def __init__(self, outf=sys.stdout, errf=sys.stderr):
+        self.outf = outf
+        self.errf = errf
 
     def usage(self, prog, *args):
         parser, _ = self._create_parser(prog)

diff --git a/source4/scripting/python/samba/tests/netcmd.py b/source4/scripting/python/samba/tests/netcmd.py
index d7c6482a460703781deddf9430851712c82ac7a0..66646ff00e10bbdab0027a45121e2883d6941510 100644 (file)
--- a/source4/scripting/python/samba/tests/netcmd.py
+++ b/source4/scripting/python/samba/tests/netcmd.py
@@ -28,9 +28,7 @@ import samba.tests
 class NetCmdTestCase(samba.tests.TestCase):
 
     def run_netcmd(self, cmd_klass, args, retcode=0):
-        cmd = cmd_klass()
-        cmd.outf = StringIO()
-        cmd.errf = StringIO()
+        cmd = cmd_klass(outf=StringIO(), errf=StringIO())
         try:
             retval = cmd._run(cmd_klass.__name__, *args)
         except Exception, e: