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

PEP8: fix E123: closing bracket does not match indentation of opening bracket's line

Browse Source 
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>
This commit is contained in:
Joe Guo 2018-07-30 18:14:37 +12:00 committed by Douglas Bagnall
parent 297faf3252
commit 484ce0634b
52 changed files with 234 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tevent/tevent.py
View File

@ -25,4 +25,4 @@ from _tevent import (
backend_list,
Context,
Signal,
)
)

2
python/samba/getopt.py
View File

@ -26,7 +26,7 @@ from samba.credentials import (
AUTO_USE_KERBEROS,
DONT_USE_KERBEROS,
MUST_USE_KERBEROS,
)
)
import sys

2
python/samba/kcc/kcc_utils.py
View File

@ -28,7 +28,7 @@ from samba.dcerpc import (
drsblobs,
drsuapi,
misc,
)
)
from samba.common import dsdb_Dn
from samba.ndr import ndr_unpack, ndr_pack
from collections import Counter

6
python/samba/ms_schema.py
View File

@ -47,7 +47,7 @@ bitFields["searchflags"] = {
'fEXTENDEDLINKTRACKING': 21, # XL
'fBASEONLY': 20, # BO
'fPARTITIONSECRET': 19, # SE
}
}
# ADTS: 2.2.10
bitFields["systemflags"] = {
@ -64,12 +64,12 @@ bitFields["systemflags"] = {
'FLAG_CONFIG_ALLOW_MOVE': 2, # AM
'FLAG_CONFIG_ALLOW_RENAME': 1, # AR
'FLAG_DISALLOW_DELETE': 0 # DD
}
}
# ADTS: 2.2.11
bitFields["schemaflagsex"] = {
'FLAG_ATTR_IS_CRITICAL': 31
}
}
# ADTS: 3.1.1.2.2.2
oMObjectClassBER = {

4
python/samba/netcmd/computer.py
View File

@ -39,14 +39,14 @@ from samba import (
Ldb,
werror,
WERRORError
)
)
from samba.netcmd import (
Command,
CommandError,
SuperCommand,
Option,
)
)
def _is_valid_ip(ip_string, address_families=None):

2
python/samba/netcmd/dbcheck.py
View File

@ -24,7 +24,7 @@ from samba.netcmd import (
Command,
CommandError,
Option
)
)
from samba.dbchecker import dbcheck

2
python/samba/netcmd/delegation.py
View File

@ -30,7 +30,7 @@ from samba.netcmd import (
CommandError,
SuperCommand,
Option
)
)
class cmd_delegation_show(Command):

2
python/samba/netcmd/dns.py
View File

@ -36,7 +36,7 @@ from samba.netcmd import (
CommandError,
Option,
SuperCommand,
)
)
from samba.dcerpc import dnsp, dnsserver
from samba.dnsserver import ARecord, AAAARecord, PTRRecord, CNameRecord, NSRecord, MXRecord, SOARecord, SRVRecord, TXTRecord

6
python/samba/netcmd/domain.py
View File

@ -59,7 +59,7 @@ from samba.netcmd import (
CommandError,
SuperCommand,
Option
)
)
from samba.netcmd.fsmo import get_fsmo_roleowner
from samba.netcmd.common import netcmd_get_domain_infos_via_cldap
from samba.samba3 import Samba3
@ -84,14 +84,14 @@ from samba.dsdb import (
UF_SERVER_TRUST_ACCOUNT,
UF_TRUSTED_FOR_DELEGATION,
UF_PARTIAL_SECRETS_ACCOUNT
)
)
from samba.provision import (
provision,
ProvisioningError,
DEFAULT_MIN_PWD_LENGTH,
setup_path
)
)
from samba.provision.common import (
FILL_FULL,

2
python/samba/netcmd/drs.py
View File

@ -30,7 +30,7 @@ from samba.netcmd import (
CommandError,
Option,
SuperCommand,
)
)
from samba.samdb import SamDB
from samba import drs_utils, nttime2string, dsdb
from samba.dcerpc import drsuapi, misc

2
python/samba/netcmd/dsacl.py
View File

@ -40,7 +40,7 @@ from samba.netcmd import (
CommandError,
SuperCommand,
Option,
)
)

2
python/samba/netcmd/forest.py
View File

@ -25,7 +25,7 @@ from samba.netcmd import (
CommandError,
SuperCommand,
Option
)
)
class cmd_forest_show(Command):
"""Display forest settings.

2
python/samba/netcmd/fsmo.py
View File

@ -28,7 +28,7 @@ from samba.netcmd import (
CommandError,
SuperCommand,
Option,
)
)
from samba.samdb import SamDB
def get_fsmo_roleowner(samdb, roledn, role):

2
python/samba/netcmd/gpo.py
View File

@ -32,7 +32,7 @@ from samba.netcmd import (
CommandError,
Option,
SuperCommand,
)
)
from samba.samdb import SamDB
from samba import dsdb
from samba.dcerpc import security

2
python/samba/netcmd/ldapcmp.py
View File

@ -35,7 +35,7 @@ from samba.netcmd import (
Command,
CommandError,
Option,
)
)
global summary
summary = {}

2
python/samba/netcmd/nettime.py
View File

@ -22,7 +22,7 @@ from samba.net import Net
from samba.netcmd import (
Command,
)
)
class cmd_time(Command):
"""Retrieve the time on a server.

2
python/samba/netcmd/ntacl.py
View File

@ -35,7 +35,7 @@ from samba.netcmd import (
CommandError,
SuperCommand,
Option,
)
)

2
python/samba/netcmd/ou.py
View File

@ -25,7 +25,7 @@ from samba.netcmd import (
CommandError,
Option,
SuperCommand,
)
)
from samba.samdb import SamDB
from samba import dsdb
from operator import attrgetter

2
python/samba/netcmd/schema.py
View File

@ -26,7 +26,7 @@ from samba.netcmd import (
CommandError,
SuperCommand,
Option
)
)
class cmd_schema_attribute_modify(Command):
"""Modify attribute settings in the schema partition.

2
python/samba/netcmd/sites.py
View File

@ -26,7 +26,7 @@ from samba.netcmd import (
CommandError,
SuperCommand,
Option,
)
)
class cmd_sites_create(Command):

2
python/samba/netcmd/spn.py
View File

@ -27,7 +27,7 @@ from samba.netcmd import (
CommandError,
SuperCommand,
Option
)
)
class cmd_spn_list(Command):

8
python/samba/netcmd/user.py
View File

@ -45,7 +45,7 @@ from samba import (
gensec,
generate_random_password,
Ldb,
)
)
from samba.net import Net
from samba.netcmd import (
@ -53,7 +53,7 @@ from samba.netcmd import (
CommandError,
SuperCommand,
Option,
)
)
from samba.compat import text_type
try:
@ -67,7 +67,7 @@ except ImportError as e:
"python-gpgme required"
disabled_virtual_attributes = {
}
}
virtual_attributes = {
"virtualClearTextUTF8": {
@ -79,7 +79,7 @@ virtual_attributes = {
"virtualSambaGPG": {
"flags": ldb.ATTR_FLAG_FORCE_BASE64_LDIF,
},
}
}
get_random_bytes_fn = None
if get_random_bytes_fn is None:

14
python/samba/provision/__init__.py
View File

@ -60,17 +60,17 @@ from samba import (
valid_netbios_name,
version,
is_heimdal_built,
)
)
from samba.dcerpc import security, misc
from samba.dcerpc.misc import (
SEC_CHAN_BDC,
SEC_CHAN_WKSTA,
)
)
from samba.dsdb import (
DS_DOMAIN_FUNCTION_2003,
DS_DOMAIN_FUNCTION_2008_R2,
ENC_ALL_TYPES,
)
)
from samba.idmap import IDmapDB
from samba.ms_display_specifiers import read_ms_ldif
from samba.ntacls import setntacl, getntacl, dsacl2fsacl
@ -80,7 +80,7 @@ from samba.provision.backend import (
FDSBackend,
LDBBackend,
OpenLDAPBackend,
)
)
from samba.descriptor import (
get_empty_descriptor,
get_config_descriptor,
@ -102,7 +102,7 @@ from samba.descriptor import (
get_dns_forest_microsoft_dns_descriptor,
get_dns_domain_microsoft_dns_descriptor,
get_managed_service_accounts_descriptor,
)
)
from samba.provision.common import (
setup_path,
setup_add_ldif,
@ -116,7 +116,7 @@ from samba.provision.sambadns import (
get_dnsadmins_sid,
setup_ad_dns,
create_dns_update_list
)
)
import samba.param
import samba.registry
@ -2012,7 +2012,7 @@ _ROLES_MAP = {
"member server": "member server",
"standalone": "standalone server",
"standalone server": "standalone server",
}
}
def sanitize_server_role(role):

6
python/samba/provision/sambadns.py
View File

@ -39,7 +39,7 @@ from samba.dsdb import (
DS_DOMAIN_FUNCTION_2008_R2,
DS_DOMAIN_FUNCTION_2012_R2,
DS_DOMAIN_FUNCTION_2016
)
)
from samba.descriptor import (
get_domain_descriptor,
get_domain_delete_protected1_descriptor,
@ -47,7 +47,7 @@ from samba.descriptor import (
get_dns_partition_descriptor,
get_dns_forest_microsoft_dns_descriptor,
get_dns_domain_microsoft_dns_descriptor
)
)
from samba.provision.common import (
setup_path,
setup_add_ldif,
@ -57,7 +57,7 @@ from samba.provision.common import (
FILL_SUBDOMAIN,
FILL_NT4SYNC,
FILL_DRS,
)
)
from samba.samdb import get_default_backend_store

2
python/samba/tests/get_opt.py
View File

@ -25,7 +25,7 @@ from samba.getopt import (
DONT_USE_KERBEROS,
MUST_USE_KERBEROS,
parse_kerberos_arg,
)
)
import samba.tests
class KerberosOptionTests(samba.tests.TestCase):

2
python/samba/tests/provision.py
View File

@ -26,7 +26,7 @@ from samba.provision import (
sanitize_server_role,
setup_secretsdb,
findnss,
)
)
import samba.tests
from samba.tests import env_loadparm, TestCase

2
python/samba/tests/py_credentials.py
View File

@ -30,7 +30,7 @@ from samba.dcerpc.netlogon import (
netr_Authenticator,
netr_WorkstationInformation,
MSV1_0_ALLOW_MSVCHAPV2
)
)
from samba.dcerpc.misc import SEC_CHAN_WKSTA
from samba.dsdb import (
UF_WORKSTATION_TRUST_ACCOUNT,

2
python/samba/tests/source.py
View File

@ -27,7 +27,7 @@ import warnings
from samba.tests import (
TestCase,
)
)
def get_python_source_files():

2
python/samba/tests/xattr.py
View File

@ -25,7 +25,7 @@ from samba.tests import (
SkipTest,
TestCase,
TestCaseInTempDir,
)
)
import random
import shutil
import os

2
script/autobuild.py
View File

@ -48,7 +48,7 @@ builddirs = {
"pass" : ".",
"fail" : ".",
"retry" : "."
}
}
defaulttasks = [ "ctdb",
"samba",

2
selftest/selftesthelpers.py
View File

@ -167,7 +167,7 @@ smbtorture4_options = [
"--maximum-runtime=$SELFTEST_MAXTIME",
"--basedir=$SELFTEST_TMPDIR",
"--format=subunit"
] + get_env_torture_options()
] + get_env_torture_options()
def plansmbtorture4testsuite(name, env, options, target, modname=None):

2
source3/selftest/tests.py
View File

@ -25,7 +25,7 @@ from selftesthelpers import *
smbtorture4_options.extend([
'--option=torture:sharedelay=100000',
'--option=torture:writetimeupdatedelay=500000',
])
])
def plansmbtorture4testsuite(name, env, options, description=''):
if description == '':

2
source4/torture/drs/python/delete_object.py
View File

@ -32,7 +32,7 @@ import time
from ldb import (
SCOPE_SUBTREE,
)
)
import drs_base, ldb

2
source4/torture/drs/python/drs_base.py
View File

@ -38,7 +38,7 @@ from ldb import (
SCOPE_BASE,
Message,
FLAG_MOD_REPLACE,
)
)
from samba.compat import cmp_fn
class DrsBaseTestCase(SambaToolCmdTest):

2
source4/torture/drs/python/repl_move.py
View File

@ -40,7 +40,7 @@ from samba.drs_utils import drs_DsBind
from ldb import (
SCOPE_BASE,
SCOPE_SUBTREE,
)
)
import drs_base, ldb
from samba.dcerpc.drsuapi import *

2
source4/torture/drs/python/repl_schema.py
View File

@ -39,7 +39,7 @@ from ldb import (
Message,
FLAG_MOD_ADD,
FLAG_MOD_REPLACE
)
)
from samba.dcerpc import drsuapi, misc
from samba.drs_utils import drs_DsBind
from samba import dsdb