PEP8: fix E302: expected 2 blank lines, found 1

Signed-off-by: Joe Guo <[email protected]>
Reviewed-by: Andrew Bartlett <[email protected]>
Reviewed-by: Douglas Bagnall <[email protected]>

Author: catalyst-joe-guo

.ycm_extra_conf.py

@@ -252,6 +252,7 @@
 
 SOURCE_EXTENSIONS = [ '.C', '.cpp', '.cxx', '.cc', '.c', '.m', '.mm' ]
 
+
 def DirectoryOfThisScript():
   return os.path.dirname( os.path.abspath( __file__ ) )
 

auth/credentials/tests/bind.py

@@ -46,6 +46,7 @@
 creds_user3 = copy.deepcopy(creds)
 creds_user4 = copy.deepcopy(creds)
 
+
 class BindTests(samba.tests.TestCase):
 
     info_dc = None

lib/ldb-samba/tests/match_rules.py

@@ -22,6 +22,8 @@
 #       This should be fixed to work inline with Windows.
 #       The literal strings are in the case Windows uses.
 # Windows appear to preserve casing of the RDN and uppercase the other keys.
+
+
 class MatchRulesTests(samba.tests.TestCase):
     def setUp(self):
         super(MatchRulesTests, self).setUp()
@@ -943,6 +945,7 @@ def test_misc_matches(self):
                                expression="memberOf:1.2.840.113556.1.4.1941:=cn=g1,%s" % self.ou_groups)
         self.assertEqual(len(res1), 0)
 
+
 class MatchRuleConditionTests(samba.tests.TestCase):
     def setUp(self):
         super(MatchRuleConditionTests, self).setUp()

lib/ldb/tests/python/api.py

@@ -22,6 +22,7 @@
     "@IDX_DN_GUID": [b"GUID"]
 }
 
+
 def tempdir():
     import tempfile
     try:
@@ -685,6 +686,8 @@ def test_no_crash_broken_expr(self):
         self.assertRaises(ldb.LdbError, lambda: l.search("", ldb.SCOPE_SUBTREE, "&(dc=*)(dn=*)", ["dc"]))
 
 # Run the SimpleLdb tests against an lmdb backend
+
+
 class SimpleLdbLmdb(SimpleLdb):
 
     def setUp(self):
@@ -695,6 +698,7 @@ def setUp(self):
     def tearDown(self):
         super(SimpleLdbLmdb, self).tearDown()
 
+
 class SearchTests(LdbBaseTest):
     def tearDown(self):
         shutil.rmtree(self.testdir)
@@ -1367,6 +1371,7 @@ def setUp(self):
                     "@IDXATTR": [b"x", b"y", b"ou"]})
         self.IDX = True
 
+
 class IndexedCheckSearchTests(IndexedSearchTests):
     """Test searches using the index, to ensure the index doesn't
        break things (full scan disabled)"""
@@ -1375,6 +1380,7 @@ def setUp(self):
         self.IDXCHECK = True
         super(IndexedCheckSearchTests, self).setUp()
 
+
 class IndexedSearchDnFilterTests(SearchTests):
     """Test searches using the index, to ensure the index doesn't
        break things"""
@@ -1389,6 +1395,7 @@ def setUp(self):
                     "@IDXATTR": [b"x", b"y", b"ou"]})
         self.IDX = True
 
+
 class IndexedAndOneLevelSearchTests(SearchTests):
     """Test searches using the index including @IDXONE, to ensure
        the index doesn't break things"""
@@ -1401,6 +1408,7 @@ def setUp(self):
         self.IDX = True
         self.IDXONE = True
 
+
 class IndexedCheckedAndOneLevelSearchTests(IndexedAndOneLevelSearchTests):
     """Test searches using the index including @IDXONE, to ensure
        the index doesn't break things (full scan disabled)"""
@@ -1409,6 +1417,7 @@ def setUp(self):
         self.IDXCHECK = True
         super(IndexedCheckedAndOneLevelSearchTests, self).setUp()
 
+
 class IndexedAndOneLevelDNFilterSearchTests(SearchTests):
     """Test searches using the index including @IDXONE, to ensure
        the index doesn't break things"""
@@ -1427,6 +1436,7 @@ def setUp(self):
         self.IDX = True
         self.IDXONE = True
 
+
 class GUIDIndexedSearchTests(SearchTests):
     """Test searches using the index, to ensure the index doesn't
        break things"""
@@ -1460,6 +1470,7 @@ def setUp(self):
         self.IDX = True
         self.IDXGUID = True
 
+
 class GUIDAndOneLevelIndexedSearchTests(SearchTests):
     """Test searches using the index including @IDXONE, to ensure
        the index doesn't break things"""
@@ -1479,6 +1490,7 @@ def setUp(self):
         self.IDXGUID = True
         self.IDXONE = True
 
+
 class GUIDIndexedSearchTestsLmdb(GUIDIndexedSearchTests):
 
     def setUp(self):
@@ -1719,6 +1731,7 @@ def setUp(self):
     def tearDown(self):
         super(AddModifyTestsLmdb, self).tearDown()
 
+
 class IndexedAddModifyTests(AddModifyTests):
     """Test searches using the index, to ensure the index doesn't
        break things"""
@@ -1798,6 +1811,7 @@ def test_add_dup_guid_add(self):
                     "x": "z", "y": "a",
                     "objectUUID": b"0123456789abcde2"})
 
+
 class GUIDIndexedAddModifyTests(IndexedAddModifyTests):
     """Test searches using the index, to ensure the index doesn't
        break things"""
@@ -1822,6 +1836,7 @@ def tearDown(self):
         self.l.transaction_commit()
         super(GUIDTransIndexedAddModifyTests, self).tearDown()
 
+
 class TransIndexedAddModifyTests(IndexedAddModifyTests):
     """Test index behaviour insdie the transaction"""
 
@@ -1833,6 +1848,7 @@ def tearDown(self):
         self.l.transaction_commit()
         super(TransIndexedAddModifyTests, self).tearDown()
 
+
 class GuidIndexedAddModifyTestsLmdb(GUIDIndexedAddModifyTests):
 
     def setUp(self):
@@ -1842,6 +1858,7 @@ def setUp(self):
     def tearDown(self):
         super(GuidIndexedAddModifyTestsLmdb, self).tearDown()
 
+
 class GuidTransIndexedAddModifyTestsLmdb(GUIDTransIndexedAddModifyTests):
 
     def setUp(self):
@@ -1851,6 +1868,7 @@ def setUp(self):
     def tearDown(self):
         super(GuidTransIndexedAddModifyTestsLmdb, self).tearDown()
 
+
 class BadIndexTests(LdbBaseTest):
     def setUp(self):
         super(BadIndexTests, self).setUp()
@@ -2011,6 +2029,7 @@ def setUp(self):
 
         super(GUIDBadIndexTests, self).setUp()
 
+
 class DnTests(TestCase):
 
     def setUp(self):
@@ -2253,6 +2272,7 @@ def test_is_null(self):
         dn = ldb.Dn(self.ldb, '')
         self.assertTrue(dn.is_null())
 
+
 class LdbMsgTests(TestCase):
 
     def setUp(self):
@@ -2621,6 +2641,7 @@ def request(self, *args, **kwargs):
         l = ldb.Ldb(self.filename)
         self.assertEqual(["init"], ops)
 
+
 class LdbResultTests(LdbBaseTest):
 
     def setUp(self):

lib/talloc/test_pytalloc.py

@@ -11,6 +11,7 @@
 import talloc
 import _test_pytalloc
 
+
 def dummy_func():
     pass
 
@@ -109,6 +110,7 @@ def test_compare_different_types(self):
         self.assertFalse(obj1 >= obj2)
         self.assertFalse(obj1 > obj2)
 
+
 class TallocBaseComparisonTests(unittest.TestCase):
 
     def test_compare_same(self):

lib/tevent/bindings.py

@@ -27,6 +27,7 @@
 
 import _tevent
 
+
 class BackendListTests(TestCase):
 
     def test_backend_list(self):

python/examples/samr.py

@@ -26,9 +26,11 @@
 
 from samba.dcerpc import samr, security
 
+
 def display_lsa_string(str):
     return str.string
 
+
 def FillUserInfo(samr, dom_handle, users, level):
     """fill a user array with user information from samrQueryUserInfo"""
     for i in range(len(users)):
@@ -39,6 +41,7 @@ def FillUserInfo(samr, dom_handle, users, level):
         users[i] = info
         samr.Close(user_handle)
 
+
 def toArray((handle, array, num_entries)):
     ret = []
     for x in range(num_entries):
@@ -51,16 +54,19 @@ def test_Connect(samr):
     print "Testing samr_Connect"
     return samr.Connect2(None, security.SEC_FLAG_MAXIMUM_ALLOWED)
 
+
 def test_LookupDomain(samr, handle, domain):
     """test the samr_LookupDomain interface"""
     print "Testing samr_LookupDomain"
     return samr.LookupDomain(handle, domain)
 
+
 def test_OpenDomain(samr, handle, sid):
     """test the samr_OpenDomain interface"""
     print "Testing samr_OpenDomain"
     return samr.OpenDomain(handle, security.SEC_FLAG_MAXIMUM_ALLOWED, sid)
 
+
 def test_EnumDomainUsers(samr, dom_handle):
     """test the samr_EnumDomainUsers interface"""
     print "Testing samr_EnumDomainUsers"
@@ -69,6 +75,7 @@ def test_EnumDomainUsers(samr, dom_handle):
     for idx, user in users:
         print "\t%s\t(%d)" % (user.string, idx)
 
+
 def test_EnumDomainGroups(samr, dom_handle):
     """test the samr_EnumDomainGroups interface"""
     print "Testing samr_EnumDomainGroups"
@@ -77,11 +84,13 @@ def test_EnumDomainGroups(samr, dom_handle):
     for idx, group in groups:
         print "\t%s\t(%d)" % (group.string, idx)
 
+
 def test_domain_ops(samr, dom_handle):
     """test domain specific ops"""
     test_EnumDomainUsers(samr, dom_handle)
     test_EnumDomainGroups(samr, dom_handle)
 
+
 def test_EnumDomains(samr, handle):
     """test the samr_EnumDomains interface"""
     print "Testing samr_EnumDomains"

python/examples/winreg.py

@@ -32,6 +32,7 @@
 print "Connecting to " + binding
 conn = winreg.winreg(binding, sambaopts.get_loadparm())
 
+
 def list_values(key):
     (num_values, max_valnamelen, max_valbufsize) = conn.QueryInfoKey(key, winreg.String())[4:8]
     for i in range(num_values):
@@ -53,6 +54,7 @@ def list_values(key):
 #            printf("\t\t0x%llx (%lld)\n", v.value, v.value)
 #        }
 
+
 def list_path(key, path):
     count = 0
     (num_subkeys, max_subkeylen, max_subkeysize) = conn.QueryInfoKey(key, winreg.String())[1:4]

python/samba/__init__.py

@@ -305,6 +305,8 @@ def setup_file(template, fname, subst_vars=None):
         f.close()
 
 MAX_NETBIOS_NAME_LEN = 15
+
+
 def is_valid_netbios_char(c):
     return (c.isalnum() or c in " !#$%&'()-.@^_{}~")
 
@@ -364,9 +366,11 @@ def dn_from_dns_name(dnsdomain):
     """return a DN from a DNS name domain/forest root"""
     return "DC=" + ",DC=".join(dnsdomain.split("."))
 
+
 def current_unix_time():
     return int(time.time())
 
+
 def string_to_byte_array(string):
     blob = [0] * len(string)
 
@@ -375,6 +379,7 @@ def string_to_byte_array(string):
 
     return blob
 
+
 def arcfour_encrypt(key, data):
     from samba.crypto import arcfour_crypt_blob
     return arcfour_crypt_blob(data, key)