From: Joe Guo Date: Mon, 30 Jul 2018 06:22:54 +0000 (+1200) Subject: PEP8: fix W391: blank line at end of file X-Git-Url: http://git.samba.org/samba.git/?p=amitay%2Fsamba.git;a=commitdiff_plain;h=c9f2fdea1dc91bf692fba2b74882371b0b35e1dc PEP8: fix W391: blank line at end of file Signed-off-by: Joe Guo Reviewed-by: Andrew Bartlett Reviewed-by: Douglas Bagnall --- diff --git a/python/samba/gp_ext_loader.py b/python/samba/gp_ext_loader.py index ce5d4191550..89ce4fa62d7 100644 --- a/python/samba/gp_ext_loader.py +++ b/python/samba/gp_ext_loader.py @@ -57,4 +57,3 @@ def get_gp_client_side_extensions(logger, smb_conf): logger.info('Loaded user extension from %s: %s' % (gp_ext['DllName'], ext.__name__)) return (machine_exts, user_exts) - diff --git a/python/samba/ms_display_specifiers.py b/python/samba/ms_display_specifiers.py index fd125806ca1..2a81c2299c8 100644 --- a/python/samba/ms_display_specifiers.py +++ b/python/samba/ms_display_specifiers.py @@ -193,4 +193,3 @@ if __name__ == '__main__': sys.exit(1) print(read_ms_ldif(display_specifiers_file)) - diff --git a/python/samba/netcmd/ntacl.py b/python/samba/netcmd/ntacl.py index 51fdedc74a9..f64b04758c5 100644 --- a/python/samba/netcmd/ntacl.py +++ b/python/samba/netcmd/ntacl.py @@ -279,4 +279,3 @@ class cmd_ntacl(SuperCommand): subcommands["sysvolreset"] = cmd_ntacl_sysvolreset() subcommands["sysvolcheck"] = cmd_ntacl_sysvolcheck() subcommands["getdosinfo"] = cmd_dosinfo_get() - diff --git a/python/samba/netcmd/spn.py b/python/samba/netcmd/spn.py index dff4bae58d4..62884a4ec09 100644 --- a/python/samba/netcmd/spn.py +++ b/python/samba/netcmd/spn.py @@ -201,4 +201,3 @@ class cmd_spn(SuperCommand): subcommands["add"] = cmd_spn_add() subcommands["list"] = cmd_spn_list() subcommands["delete"] = cmd_spn_delete() - diff --git a/python/samba/tests/dcerpc/__init__.py b/python/samba/tests/dcerpc/__init__.py index d84cb57a096..b8df5a2c31f 100644 --- a/python/samba/tests/dcerpc/__init__.py +++ b/python/samba/tests/dcerpc/__init__.py @@ -17,4 +17,3 @@ # along with this program. If not, see . """Tests for the DCE/RPC Python bindings.""" - diff --git a/python/samba/tests/dcerpc/sam.py b/python/samba/tests/dcerpc/sam.py index d42c4f797fa..9c432e3a37e 100644 --- a/python/samba/tests/dcerpc/sam.py +++ b/python/samba/tests/dcerpc/sam.py @@ -45,4 +45,3 @@ class SamrTests(RpcInterfaceTestCase): handle = self.conn.Connect2(None, security.SEC_FLAG_MAXIMUM_ALLOWED) domains = toArray(*self.conn.EnumDomains(handle, 0, 4294967295)) self.conn.Close(handle) - diff --git a/python/samba/tests/gpo.py b/python/samba/tests/gpo.py index ce766cd8746..881728575c7 100644 --- a/python/samba/tests/gpo.py +++ b/python/samba/tests/gpo.py @@ -148,4 +148,3 @@ class GPOTests(tests.TestCase): 'Failed to find test variable in gpext.conf') parser.remove_section('test_section') atomic_write_conf(lp, parser) - diff --git a/python/samba/tests/lsa_string.py b/python/samba/tests/lsa_string.py index b29e03bb349..b8519b6b37f 100644 --- a/python/samba/tests/lsa_string.py +++ b/python/samba/tests/lsa_string.py @@ -75,6 +75,3 @@ class LsaStringTests(TestCase): # and one with contents self.assertEqual("Hello world", str(lsa.String("Hello world"))) - - - diff --git a/python/samba/tests/ntlmdisabled.py b/python/samba/tests/ntlmdisabled.py index 6d2afe9054d..ab46bb6cae8 100644 --- a/python/samba/tests/ntlmdisabled.py +++ b/python/samba/tests/ntlmdisabled.py @@ -86,4 +86,3 @@ class NtlmDisabledTests(TestCase): pass else: raise - diff --git a/python/samba/tests/password_test.py b/python/samba/tests/password_test.py index 730bd4d4789..37eeeda7cee 100644 --- a/python/samba/tests/password_test.py +++ b/python/samba/tests/password_test.py @@ -58,4 +58,3 @@ class PasswordTestCase(samba.tests.TestCase): samdb = self.ldb PasswordCommon.allow_password_changes(self, samdb) - diff --git a/python/samba/tests/samba_tool/schema.py b/python/samba/tests/samba_tool/schema.py index 54a103b8187..6d502ef4e17 100644 --- a/python/samba/tests/samba_tool/schema.py +++ b/python/samba/tests/samba_tool/schema.py @@ -110,5 +110,3 @@ class SchemaCmdTestCase(SambaToolCmdTest): self.assertCmdSuccess(result, out, err) self.assertEquals(err, "", "Shouldn't be any error messages") self.assertIn("dn: CN=Person,CN=Schema,CN=Configuration,DC=samba,DC=example,DC=com", out) - - diff --git a/python/samba/tests/upgradeprovision.py b/python/samba/tests/upgradeprovision.py index 12dd3ecb0ec..ab091676fca 100644 --- a/python/samba/tests/upgradeprovision.py +++ b/python/samba/tests/upgradeprovision.py @@ -153,5 +153,3 @@ class UpdateSecretsTests(samba.tests.TestCaseInTempDir): if os.path.exists(path): os.unlink(path) super(UpdateSecretsTests, self).tearDown() - - diff --git a/source3/build/charset.py b/source3/build/charset.py index bdb818f83ea..afd9a9e7943 100644 --- a/source3/build/charset.py +++ b/source3/build/charset.py @@ -46,4 +46,3 @@ def CHECK_SAMBA3_CHARSET(conf, crossbuild=False): else: conf.DEFINE('DEFAULT_DOS_CHARSET', "ASCII", quote=True) conf.DEFINE('DEFAULT_UNIX_CHARSET', "UTF8", quote=True) - diff --git a/source3/torture/test_ntlm_auth.py b/source3/torture/test_ntlm_auth.py index 6f9636e6772..9f1265d1ebf 100755 --- a/source3/torture/test_ntlm_auth.py +++ b/source3/torture/test_ntlm_auth.py @@ -334,5 +334,3 @@ def main(): if __name__ == "__main__": main() - - diff --git a/source4/dsdb/tests/python/dsdb_schema_info.py b/source4/dsdb/tests/python/dsdb_schema_info.py index 651be8f3414..939bf95d599 100755 --- a/source4/dsdb/tests/python/dsdb_schema_info.py +++ b/source4/dsdb/tests/python/dsdb_schema_info.py @@ -193,4 +193,3 @@ systemOnly: FALSE # compare resulting schemaInfo schi_after = self._getSchemaInfo() self._checkSchemaInfo(schi_before, schi_after) - diff --git a/source4/lib/wmi/wmi.py b/source4/lib/wmi/wmi.py index 4651c57c1b3..5f68ba98766 100644 --- a/source4/lib/wmi/wmi.py +++ b/source4/lib/wmi/wmi.py @@ -118,5 +118,3 @@ IEnumWbemClassObject_swigregister = _wmi.IEnumWbemClassObject_swigregister IEnumWbemClassObject_swigregister(IEnumWbemClassObject) IEnumWbemClassObject_SmartNext = _wmi.IEnumWbemClassObject_SmartNext - - diff --git a/source4/torture/drs/python/delete_object.py b/source4/torture/drs/python/delete_object.py index 81508b494ae..5ccd8fd29b6 100644 --- a/source4/torture/drs/python/delete_object.py +++ b/source4/torture/drs/python/delete_object.py @@ -377,4 +377,3 @@ class DrsDeleteObjectTestCase(drs_base.DrsBaseTestCase): # trigger replication from DC1 to DC2, for cleanup self._net_drs_replicate(DC=self.dnsname_dc2, fromDC=self.dnsname_dc1, forced=True) - diff --git a/source4/torture/drs/python/getnc_unpriv.py b/source4/torture/drs/python/getnc_unpriv.py index 0cf112dbbd3..b4788c5d4a0 100644 --- a/source4/torture/drs/python/getnc_unpriv.py +++ b/source4/torture/drs/python/getnc_unpriv.py @@ -304,5 +304,3 @@ class DrsReplicaSyncUnprivTestCase(drs_base.DrsBaseTestCase): partial_attribute_set=self.get_partial_attribute_set()) self._test_repl_full(expected_error=[werror.WERR_DS_DRA_ACCESS_DENIED], partial_attribute_set=self.get_partial_attribute_set()) - - diff --git a/source4/torture/drs/python/replica_sync.py b/source4/torture/drs/python/replica_sync.py index fc32476636a..2c881d3e853 100644 --- a/source4/torture/drs/python/replica_sync.py +++ b/source4/torture/drs/python/replica_sync.py @@ -746,4 +746,3 @@ objectClass: organizationalUnit # Check deleted on DC2 self._check_deleted(self.ldb_dc2, self.ou1) self._check_deleted(self.ldb_dc2, self.ou2) - diff --git a/source4/torture/libnet/python/samr-test.py b/source4/torture/libnet/python/samr-test.py index 82cf61d33b1..8e8695e416b 100644 --- a/source4/torture/libnet/python/samr-test.py +++ b/source4/torture/libnet/python/samr-test.py @@ -57,4 +57,3 @@ class Libnet_SetPwdTest(samba.tests.TestCase): credentials=creds) ######################################################################################## -