PEP8: improve spacing around colons

These dropped out of Joe's patches during rebase and review.

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

diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py
index dccce3d83f2b90ab4bd0242c93ea6ab48de20664..8c0c37917f3a4e2197cb9369e48f0a9c496a46cd 100644 (file)
--- a/python/samba/provision/__init__.py
+++ b/python/samba/provision/__init__.py
@@ -1468,7 +1468,7 @@ def fill_samdb(samdb, lp, names, logger, policyguid,
 
         setup_add_ldif(samdb, setup_path("extended-rights.ldif"), {
                 "CONFIGDN": names.configdn,
-                "INC2012" : incl_2012,
+                "INC2012": incl_2012,
                 })
 
         logger.info("Setting up display specifiers")

diff --git a/python/samba/provision/backend.py b/python/samba/provision/backend.py
index 579308899e5c4c17132e68503f6973e79ebf5911..5b7cd00befb10d822245dc8604d081c07e38b75e 100644 (file)
--- a/python/samba/provision/backend.py
+++ b/python/samba/provision/backend.py
@@ -422,9 +422,9 @@ class OpenLDAPBackend(LDAPBackend):
                 rid = rid + 1
                 mmr_syncrepl_schema_config += read_and_sub_file(
                     setup_path("mmr_syncrepl.conf"), {
-                        "RID" : str(rid),
+                        "RID": str(rid),
                         "MMRDN": self.names.schemadn,
-                        "LDAPSERVER" : url,
+                        "LDAPSERVER": url,
                         "MMR_PASSWORD": mmr_pass})
 
                 rid = rid + 1

diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py
index f948feb60cd82e5712cec25db17357a64c7df522..7fb42f65d4e35c23e192a8eb670aaa4b5a55b7ab 100644 (file)
--- a/python/samba/provision/sambadns.py
+++ b/python/samba/provision/sambadns.py
@@ -975,12 +975,13 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger):
             logger.warning("BIND version unknown, please modify %s manually." % paths.namedconf)
         setup_file(setup_path("named.conf.dlz"), paths.namedconf, {
                     "NAMED_CONF": paths.namedconf,
-                    "MODULESDIR" : samba.param.modules_dir(),
-                    "BIND9_8" : bind9_8,
-                    "BIND9_9" : bind9_9,
-                    "BIND9_10" : bind9_10,
-                    "BIND9_11" : bind9_11,
-                    "BIND9_12" : bind9_12
+                    "MODULESDIR": samba.param.modules_dir(),
+                    "BIND9_8": bind9_8,
+                    "BIND9_9": bind9_9,
+                    "BIND9_10": bind9_10,
+                    "BIND9_11": bind9_11,
+                    "BIND9_12": bind9_12
+
                     })
 
 
@@ -997,7 +998,7 @@ def create_named_txt(path, realm, dnsdomain, dnsname, binddns_dir,
     """
     setup_file(setup_path("named.txt"), path, {
             "DNSDOMAIN": dnsdomain,
-            "DNSNAME" : dnsname,
+            "DNSNAME": dnsname,
             "REALM": realm,
             "DNS_KEYTAB": keytab_name,
             "DNS_KEYTAB_ABS": os.path.join(binddns_dir, keytab_name),

diff --git a/script/autobuild.py b/script/autobuild.py
index 542d566b83b0153071138704e4d2263be8fb8107..8ffa6d446976305e6ce5b4393378679399279341 100755 (executable)
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -202,7 +202,7 @@ tasks = {
                      ("clean", "make clean", "text/plain"),
                      ("ctdb-clean", "cd ./ctdb && make clean", "text/plain")],
 
-    "samba-libs" : [
+    "samba-libs": [
                       ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
                       ("talloc-configure", "cd lib/talloc && " + samba_libs_configure_libs, "text/plain"),
                       ("talloc-make", "cd lib/talloc && make", "text/plain"),
@@ -231,7 +231,7 @@ tasks = {
                       ("allshared-configure", samba_libs_configure_samba + " --with-shared-modules=ALL", "text/plain"),
                       ("allshared-make", "make -j", "text/plain")],
 
-    "samba-none-env" : [
+    "samba-none-env": [
                       ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
                       ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
                       ("make", "make -j", "text/plain"),
@@ -240,7 +240,7 @@ tasks = {
                        "TESTS='--include-env=none'",
                        "text/plain")],
 
-    "samba-static" : [
+    "samba-static": [
                       ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
                       # build with all modules static
                       ("allstatic-configure", "./configure.developer " + samba_configure_params + " --with-static-modules=ALL", "text/plain"),
@@ -260,7 +260,7 @@ tasks = {
                       ("nonshared-configure", "./configure.developer " + samba_configure_params + " --bundled-libraries=talloc,tdb,pytdb,ldb,pyldb,tevent,pytevent --with-static-modules=ALL --nonshared-binary=smbtorture,smbd/smbd", "text/plain"),
                       ("nonshared-make", "make -j", "text/plain")],
 
-    "samba-systemkrb5" : [
+    "samba-systemkrb5": [
                       ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
                       ("configure", "./configure.developer " + samba_configure_params + " --with-system-mitkrb5 --without-ad-dc", "text/plain"),
                       ("make", "make -j", "text/plain"),
@@ -278,7 +278,7 @@ tasks = {
     # --disable-python is set (rather than major work being done to
     # support this environment).  The target here is for vendors
     # shipping a minimal smbd.
-    "samba-nopython" : [
+    "samba-nopython": [
                       ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
                       ("configure", "./configure.developer --picky-developer ${PREFIX} --with-profiling-data --disable-python --without-ad-dc", "text/plain"),
                       ("make", "make -j", "text/plain"),
@@ -312,7 +312,7 @@ tasks = {
 
 
 
-    "ldb" : [
+    "ldb": [
               ("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
               ("configure", "./configure --enable-developer -C ${PREFIX} ${EXTRA_PYTHON}", "text/plain"),
               ("make", "make", "text/plain"),
@@ -325,7 +325,7 @@ tasks = {
               ("distcheck", "make distcheck", "text/plain"),
               ("clean", "make clean", "text/plain")],
 
-    "tdb" : [
+    "tdb": [
               ("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
               ("configure", "./configure --enable-developer -C ${PREFIX} ${EXTRA_PYTHON}", "text/plain"),
               ("make", "make", "text/plain"),
@@ -335,7 +335,7 @@ tasks = {
               ("distcheck", "make distcheck", "text/plain"),
               ("clean", "make clean", "text/plain")],
 
-    "talloc" : [
+    "talloc": [
                  ("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
                  ("configure", "./configure --enable-developer -C ${PREFIX} ${EXTRA_PYTHON}", "text/plain"),
                  ("make", "make", "text/plain"),
@@ -345,7 +345,7 @@ tasks = {
                  ("distcheck", "make distcheck", "text/plain"),
                  ("clean", "make clean", "text/plain")],
 
-    "replace" : [
+    "replace": [
                   ("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
                   ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
                   ("make", "make", "text/plain"),
@@ -355,7 +355,7 @@ tasks = {
                   ("distcheck", "make distcheck", "text/plain"),
                   ("clean", "make clean", "text/plain")],
 
-    "tevent" : [
+    "tevent": [
                  ("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
                  ("configure", "./configure --enable-developer -C ${PREFIX} ${EXTRA_PYTHON}", "text/plain"),
                  ("make", "make", "text/plain"),