PEP8: fix W291: trailing whitespace

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/examples/logon/ntlogon/ntlogon.py b/examples/logon/ntlogon/ntlogon.py
index c0f6ebc6c0ef9275a69a740297adb9d6592a8f18..ff25c42ec0bebd6e9692147fef179346452b55c6 100755 (executable)
--- a/examples/logon/ntlogon/ntlogon.py
+++ b/examples/logon/ntlogon/ntlogon.py
@@ -321,7 +321,7 @@ def run():
 
     #
     # open the configuration file
-    #    
+    #
     try:
         iFile = open(configfile, 'r')
     except IOError:
@@ -330,7 +330,7 @@ def run():
 
     #
     # open the output file
-    #    
+    #
     if not debug:
         try:
             oFile = open(outdir + outfile, 'w')

diff --git a/python/examples/netbios.py b/python/examples/netbios.py
index a29b09f051776012291a52950d2287627749024b..5f71f27b1f410219bc8663eb8c3026d79c1577c3 100644 (file)
--- a/python/examples/netbios.py
+++ b/python/examples/netbios.py
@@ -2,17 +2,17 @@
 
 # Unix SMB/CIFS implementation.
 # Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008
-#   
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-#   
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-#   
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #

diff --git a/python/examples/samr.py b/python/examples/samr.py
index c1af82105aa612237f4364c6df3eb999d4e3c44e..494d086259242174b8026af518e051c1ce0693eb 100755 (executable)
--- a/python/examples/samr.py
+++ b/python/examples/samr.py
@@ -5,17 +5,17 @@
 # Copyright © Jelmer Vernooij <jelmer@samba.org> 2008
 #
 # Based on samr.js © Andrew Tridgell <tridge@samba.org>
-#   
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-#   
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-#   
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #

diff --git a/python/examples/winreg.py b/python/examples/winreg.py
index eff9f5a6dc8dcf0aee26d831c7f6412d76f942bf..604fe1db41ac445aa9b8ffece4ac5d102b7c98e3 100755 (executable)
--- a/python/examples/winreg.py
+++ b/python/examples/winreg.py
@@ -18,7 +18,7 @@ import samba.getopt as options
 parser = optparse.OptionParser("%s <BINDING> [path]" % sys.argv[0])
 sambaopts = options.SambaOptions(parser)
 parser.add_option_group(sambaopts)
-parser.add_option("--createkey", type="string", metavar="KEYNAME", 
+parser.add_option("--createkey", type="string", metavar="KEYNAME",
                   help="create a key")
 
 opts, args = parser.parse_args()

diff --git a/script/generate_param.py b/script/generate_param.py
index 2abe6ca421170a40ba92289ddd06bc74f2485056..5fa3c193a2c0382ac54b8e6f2f9e4a4e6a7cac6b 100644 (file)
--- a/script/generate_param.py
+++ b/script/generate_param.py
@@ -49,7 +49,7 @@ if options.output is None:
 
 
 def iterate_all(path):
-    """Iterate and yield all the parameters. 
+    """Iterate and yield all the parameters.
 
     :param path: path to parameters xml file
     """
@@ -134,12 +134,12 @@ def generate_functions(path_in, path_out):
 
             output_string = "FN"
             temp = context_dict.get(parameter['context'])
-            if temp is None: 
+            if temp is None:
                 raise Exception(parameter['name'] + " has an invalid context " + parameter['context'])
             output_string += temp
             if parameter['constant']:
                 output_string += "_CONST"
-            if parameter['parm']: 
+            if parameter['parm']:
                 output_string += "_PARM"
             temp = param_type_dict.get(parameter['type'])
             if temp is None:
@@ -274,7 +274,7 @@ def make_param_defs(path_in, path_out, scope):
         header = get_header(path_out)
         file_out.write("#ifndef %s\n" % header)
         file_out.write("#define %s\n\n" % header)
-        if scope == "GLOBAL": 
+        if scope == "GLOBAL":
             file_out.write("/**\n")
             file_out.write(" * This structure describes global (ie., server-wide) parameters.\n")
             file_out.write(" */\n")

diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py
index aaa7995be977b5f03efb85f81b318be1aa524c86..48bdd2aece2e2cea6ac21d5f9c1ea81728562fd3 100755 (executable)
--- a/source4/dsdb/tests/python/acl.py
+++ b/source4/dsdb/tests/python/acl.py
@@ -833,7 +833,7 @@ class AclSearchTests(AclTests):
         self.ldb_admin.create_ou("OU=ou4,OU=ou2,OU=ou1," + self.base_dn)
         self.ldb_admin.create_ou("OU=ou5,OU=ou3,OU=ou2,OU=ou1," + self.base_dn)
         self.ldb_admin.create_ou("OU=ou6,OU=ou4,OU=ou2,OU=ou1," + self.base_dn)
-        mod = "(D;;LC;;;%s)(D;;LC;;;%s)" % (str(self.user_sid), str(self.group_sid)) 
+        mod = "(D;;LC;;;%s)(D;;LC;;;%s)" % (str(self.user_sid), str(self.group_sid))
         self.sd_utils.dacl_add_ace("OU=ou2,OU=ou1," + self.base_dn, mod)
         res = self.ldb_user3.search("OU=ou1," + self.base_dn, expression="(objectClass=*)",
                                     scope=SCOPE_SUBTREE)

diff --git a/source4/dsdb/tests/python/urgent_replication.py b/source4/dsdb/tests/python/urgent_replication.py
index de412c6130bb6e7d0ef990cd1e37fb402a40a5c7..f8ea3353ca0e564cd8555e7a2c28139f38973af2 100755 (executable)
--- a/source4/dsdb/tests/python/urgent_replication.py
+++ b/source4/dsdb/tests/python/urgent_replication.py
@@ -210,7 +210,7 @@ defaultHidingValue: TRUE""")
         except LdbError:
             print("Not testing urgent replication when creating classSchema object ...\n")
 
-        # urgent replication should be enabled when modifying 
+        # urgent replication should be enabled when modifying
         m = Message()
         m.dn = Dn(self.ldb, "CN=test classSchema,CN=Schema,CN=Configuration," + self.base_dn)
         m["lDAPDisplayName"] = MessageElement("updatedTestClassSchema", FLAG_MOD_REPLACE,
@@ -273,7 +273,7 @@ rIDAvailablePool: 133001-1073741823""", ["relax:0"])
         res = self.ldb.load_partition_usn(self.base_dn)
         self.assertEquals(res["uSNHighest"], res["uSNUrgent"])
 
-        # urgent replication should NOT be enabled when deleting 
+        # urgent replication should NOT be enabled when deleting
         self.delete_force(self.ldb, "CN=RID Manager test,CN=System," + self.base_dn)
         res = self.ldb.load_partition_usn(self.base_dn)
         self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"])

diff --git a/source4/lib/wmi/wmi.py b/source4/lib/wmi/wmi.py
index fb86ba211546dab96e5028bd70db114535ea2372..4651c57c1b3a827adf1e4e8f8064050033c7e50b 100644 (file)
--- a/source4/lib/wmi/wmi.py
+++ b/source4/lib/wmi/wmi.py
@@ -78,7 +78,7 @@ class IUnknown(object):
     thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
 
-    def __init__(self, *args, **kwargs): 
+    def __init__(self, *args, **kwargs):
         _wmi.IUnknown_swiginit(self, _wmi.new_IUnknown(*args, **kwargs))
     __swig_destroy__ = _wmi.delete_IUnknown
 
@@ -92,7 +92,7 @@ class IWbemServices(object):
     thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
 
-    def __init__(self, *args, **kwargs): 
+    def __init__(self, *args, **kwargs):
         _wmi.IWbemServices_swiginit(self, _wmi.new_IWbemServices(*args, **kwargs))
     __swig_destroy__ = _wmi.delete_IWbemServices
 
@@ -108,7 +108,7 @@ class IEnumWbemClassObject(object):
     thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
 
-    def __init__(self, *args, **kwargs): 
+    def __init__(self, *args, **kwargs):
         _wmi.IEnumWbemClassObject_swiginit(self, _wmi.new_IEnumWbemClassObject(*args, **kwargs))
     __swig_destroy__ = _wmi.delete_IEnumWbemClassObject
 

diff --git a/source4/torture/drs/python/linked_attributes_drs.py b/source4/torture/drs/python/linked_attributes_drs.py
index 3a08a1a1b6513408d39721108fb9be1f49ac96d3..9a00892dd7adea3fafc2a5d7609839cfa53dcca6 100644 (file)
--- a/source4/torture/drs/python/linked_attributes_drs.py
+++ b/source4/torture/drs/python/linked_attributes_drs.py
@@ -117,7 +117,7 @@ class LATests(drs_base.DrsBaseTestCase):
         self.assertEqual(len(results), len(expected))
 
         for k, v in results:
-            self.assertTrue(k in expected) 
+            self.assertTrue(k in expected)
             self.assertEqual(expected[k], v, "%s active flag should be %d, not %d" %
                              (k, expected[k], v))
 

diff --git a/wintest/test-s3.py b/wintest/test-s3.py
index 71f5f775674a8f54d3f78814fb9a612d0c05969f..6e3cb9521d6904d45961e140230afdfdb7479ef5 100755 (executable)
--- a/wintest/test-s3.py
+++ b/wintest/test-s3.py
@@ -14,7 +14,7 @@ def set_libpath(t):
 
 def set_krb5_conf(t):
     t.run_cmd("mkdir -p ${PREFIX}/etc")
-    t.write_file("${PREFIX}/etc/krb5.conf", 
+    t.write_file("${PREFIX}/etc/krb5.conf",
                  '''[libdefaults]
        dns_lookup_realm = false
        dns_lookup_kdc = true''')

diff --git a/wintest/wintest.py b/wintest/wintest.py
index 166489aa0376b3566ad53d83b3cd1d65f4db864d..4152069bbdf59a7012132b6d829117c697761e0b 100644 (file)
--- a/wintest/wintest.py
+++ b/wintest/wintest.py
@@ -894,7 +894,7 @@ RebootOnCompletion=No
             child.sendline("ipconfig /flushdns")
             child.expect("C:")
             child.sendline("netdom join ${WIN_HOSTNAME} /Domain:%s /UserD:%s /PasswordD:%s" % (domain, username, password))
-            i = child.expect(["The command completed successfully", 
+            i = child.expect(["The command completed successfully",
                               "The specified domain either does not exist or could not be contacted."], timeout=120)
             if i == 0:
                 break