sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

KCC: more pep8 for kcc_utils

Browse Source 
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall 2015-04-09 15:00:55 +12:00 committed by Andrew Bartlett
parent edacc0314f
commit 08e41b42af
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
python/samba/kcc_utils.py
View File

@ -22,9 +22,6 @@
import ldb
import uuid
import time
import sys
import itertools
from samba import dsdb, unix2nttime
from samba.dcerpc import (
@ -68,15 +65,15 @@ class NamingContext(object):
'''Debug dump string output of class'''
text = "%s:" % (self.__class__.__name__,)
text = text + "\n\tnc_dnstr=%s" % self.nc_dnstr
text = text + "\n\tnc_guid=%s" % str(self.nc_guid)
text = text + "\n\tnc_guid=%s" % str(self.nc_guid)
if self.nc_sid is None:
text = text + "\n\tnc_sid=<absent>"
else:
text = text + "\n\tnc_sid=<present>"
text = text + "\n\tnc_type=%s (%s)" % (nctype_lut[self.nc_type],
self.nc_type)
text = text + "\n\tnc_type=%s (%s)" % (nctype_lut[self.nc_type],
self.nc_type)
return text
def load_nc(self, samdb):
@ -212,12 +209,12 @@ class NCReplica(NamingContext):
def __str__(self):
'''Debug dump string output of class'''
text = "%s:" % self.__class__.__name__
text = text + "\n\tdsa_dnstr=%s" % self.rep_dsa_dnstr
text = text + "\n\tdsa_guid=%s" % str(self.rep_dsa_guid)
text = text + "\n\tdefault=%s" % self.rep_default
text = text + "\n\tro=%s" % self.rep_ro
text = text + "\n\tpartial=%s" % self.rep_partial
text = text + "\n\tpresent=%s" % self.is_present()
text = text + "\n\tdsa_dnstr=%s" % self.rep_dsa_dnstr
text = text + "\n\tdsa_guid=%s" % self.rep_dsa_guid
text = text + "\n\tdefault=%s" % self.rep_default
text = text + "\n\tro=%s" % self.rep_ro
text = text + "\n\tpartial=%s" % self.rep_partial
text = text + "\n\tpresent=%s" % self.is_present()
text = text + "\n\tfsmo_role_owner=%s" % self.rep_fsmo_role_owner
for rep in self.rep_repsFrom:
@ -493,9 +490,9 @@ class DirectoryServiceAgent(object):
if self.dsa_dnstr is not None:
text = text + "\n\tdsa_dnstr=%s" % self.dsa_dnstr
if self.dsa_guid is not None:
text = text + "\n\tdsa_guid=%s" % str(self.dsa_guid)
text = text + "\n\tdsa_guid=%s" % str(self.dsa_guid)
if self.dsa_ivid is not None:
text = text + "\n\tdsa_ivid=%s" % str(self.dsa_ivid)
text = text + "\n\tdsa_ivid=%s" % str(self.dsa_ivid)
text = text + "\n\tro=%s" % self.is_ro()
text = text + "\n\tgc=%s" % self.is_gc()
@ -1040,6 +1037,7 @@ class NTDSConnection(object):
# First verify we have this entry to ensure nothing
# is programatically amiss
try:
#XXX msg is never used
msg = samdb.search(base=self.dnstr, scope=ldb.SCOPE_BASE)
found = True
@ -1659,10 +1657,10 @@ class Site(object):
def __str__(self):
'''Debug dump string output of class'''
text = "%s:" % self.__class__.__name__
text = text + "\n\tdn=%s" % self.site_dnstr
text = text + "\n\toptions=0x%X" % self.site_options
text = text + "\n\tdn=%s" % self.site_dnstr
text = text + "\n\toptions=0x%X" % self.site_options
text = text + "\n\ttopo_generator=%s" % self.site_topo_generator
text = text + "\n\ttopo_failover=%d" % self.site_topo_failover
text = text + "\n\ttopo_failover=%d" % self.site_topo_failover
for key, dsa in self.dsa_table.items():
text = text + "\n%s" % dsa
return text