testprogs/blackbox: PY3 bulk change for python scripts use correct python

[amitay/samba.git] / python / samba / getopt.py

diff --git a/python/samba/getopt.py b/python/samba/getopt.py
index f670f3916be2b4e65078089bd84573ebe85496df..db1c1756e4baf90120fdb2fa9ae436d28fd420dd 100644 (file)
--- a/python/samba/getopt.py
+++ b/python/samba/getopt.py
@@ -100,8 +100,8 @@ class VersionOptions(optparse.OptionGroup):
     def __init__(self, parser):
         optparse.OptionGroup.__init__(self, parser, "Version Options")
         self.add_option("-V", "--version", action="callback",
-                callback=self._display_version,
-                help="Display version number")
+                        callback=self._display_version,
+                        help="Display version number")
 
     def _display_version(self, option, opt_str, arg, parser):
         import samba
@@ -136,30 +136,30 @@ class CredentialsOptions(optparse.OptionGroup):
         self.machine_pass = False
         optparse.OptionGroup.__init__(self, parser, self.section)
         self._add_option("--simple-bind-dn", metavar="DN", action="callback",
-                        callback=self._set_simple_bind_dn, type=str,
-                        help="DN to use for a simple bind")
+                         callback=self._set_simple_bind_dn, type=str,
+                         help="DN to use for a simple bind")
         self._add_option("--password", metavar="PASSWORD", action="callback",
-                        help="Password", type=str, callback=self._set_password)
+                         help="Password", type=str, callback=self._set_password)
         self._add_option("-U", "--username", metavar="USERNAME",
-                        action="callback", type=str,
-                        help="Username", callback=self._parse_username)
+                         action="callback", type=str,
+                         help="Username", callback=self._parse_username)
         self._add_option("-W", "--workgroup", metavar="WORKGROUP",
-                        action="callback", type=str,
-                        help="Workgroup", callback=self._parse_workgroup)
+                         action="callback", type=str,
+                         help="Workgroup", callback=self._parse_workgroup)
         self._add_option("-N", "--no-pass", action="callback",
-                        help="Don't ask for a password",
-                        callback=self._set_no_password)
+                         help="Don't ask for a password",
+                         callback=self._set_no_password)
         self._add_option("-k", "--kerberos", metavar="KERBEROS",
-                        action="callback", type=str,
-                        help="Use Kerberos", callback=self._set_kerberos)
+                         action="callback", type=str,
+                         help="Use Kerberos", callback=self._set_kerberos)
         self._add_option("", "--ipaddress", metavar="IPADDRESS",
-                        action="callback", type=str,
-                        help="IP address of server",
-                        callback=self._set_ipaddress)
+                         action="callback", type=str,
+                         help="IP address of server",
+                         callback=self._set_ipaddress)
         self._add_option("-P", "--machine-pass",
-                        action="callback",
-                        help="Use stored machine account password",
-                        callback=self._set_machine_pass)
+                         action="callback",
+                         help="Use stored machine account password",
+                         callback=self._set_machine_pass)
         self._add_option("--krb5-ccache", metavar="KRB5CCNAME",
                          action="callback", type=str,
                          help="Kerberos Credentials cache",