From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 20 Jul 2011 19:01:18 +0000 (+0100)
Subject: cleanup: Style improvement to python literals in make-secnet-sites
X-Git-Tag: v0.2.0~28
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=commitdiff_plain;h=a25b1149662cae9a8fad70405d195b73f74f3fdd

cleanup: Style improvement to python literals in make-secnet-sites

Python literals can have a trailing comma after the last element.
Doing this is a good idea as it means that adding new elements at the
end doesn't necessitate modifying the previous line.

No intentional functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/make-secnet-sites b/make-secnet-sites
index 8e3ec73..403782b 100755
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -148,7 +148,7 @@ keywords={
  'networks':(networks,"Claimed networks"),
  'pubkey':(rsakey,"RSA public site key"),
  'peer':(single_ipaddr,"Tunnel peer IP address"),
- 'address':(address,"External contact address and port")
+ 'address':(address,"External contact address and port"),
 }
 
 def sp(name,value):
@@ -165,7 +165,7 @@ global_properties={
 	'setup-retries':sp,
 	'wait-time':sp,
 	'renegotiate-time':sp,
-	'restrict-nets':(lambda name,value:"# restrict-nets %s\n"%value)
+	'restrict-nets':(lambda name,value:"# restrict-nets %s\n"%value),
 }
 
 class level:
@@ -252,7 +252,7 @@ class sitelevel(level):
 	 'address':sp,
 	 'networks':None,
 	 'peer':None,
-	 'pubkey':(lambda n,v:"key %s;\n"%v)
+	 'pubkey':(lambda n,v:"key %s;\n"%v),
 	})
 	require_properties={
 	 'dh':"Diffie-Hellman group",
@@ -261,7 +261,7 @@ class sitelevel(level):
 	 'networks':"Networks claimed by the site",
 	 'hash':"hash function",
 	 'peer':"Gateway address of the site",
-	 'pubkey':"RSA public key of the site"
+	 'pubkey':"RSA public key of the site",
 	}
 	def __init__(self,w):
 		level.__init__(self,w)