whitespace cleanup

Author: apdibbo

openstack-ad-migrate.py

@@ -20,7 +20,7 @@ def ldap_flatusers(members, ld):
 		filt = s[0]
 		props = ["cn","displayName","member"]
 		results = ld.search(basedn, ldap.SCOPE_SUBTREE, filt, props)
-		
+
 		while 1:
 			result_type, result_data = ld.result(results, 0)
 			if(result_data == []):
@@ -32,9 +32,9 @@ def ldap_flatusers(members, ld):
 						ms = ms + ldap_flatusers(mems, ld)
 					else: # is a user
 						ms.append(result_data[0][1]['cn'][0])
-	return ms				
-		
-		
+	return ms
+
+
 
 def getter(groups):
 	ld = ldap.open("fed.cclrc.ac.uk")
@@ -48,10 +48,10 @@ def getter(groups):
 
 
 	basedn = "OU=Manual,OU=Distribution Lists,DC=fed,DC=cclrc,DC=ac,DC=uk"
-	
+
 	qurl = ["(|"] + ["(cn="+g+")" for g in groups] + [")"]
 	filt = "".join(qurl)
-	atrs = ["cn","displayName","member","descripion"]	
+	atrs = ["cn","displayName","member","descripion"]
 
 	results = ld.search(basedn, ldap.SCOPE_SUBTREE, filt, atrs)
 
@@ -73,7 +73,7 @@ def getter(groups):
 	return result_set
 
 def putter(groups):
-	
+
 	gcmd = "openstack project list -f json --noindent"
 	gcj = cl(gcmd)
 	gc = json.loads(gcj)
@@ -83,21 +83,21 @@ def putter(groups):
 		mems = g["mems"]
 		name = g["name"]
 		desc = g["desc"]
-		
+
 		if name not in gs:
 			gacmd = "openstack project create --domain default --description '{0}' '{1}'".format(desc, name)
 			cl(gacmd)
 
 		mcmd = "openstack user list --project '{0}' -f json --noindent".format(name)
 		mcj = cl(mcmd)
-		
+
 		mc = json.loads(mcj)
 		ms = [c["Name"] for c in mc]
 		for m in mems:
 			if m not in ms:
 				macmd = "openstack role add --user '{0}' --user-domain stfc --project '{1}' --project-domain default user".format(m,name)
-				cl(macmd)	
-	
+				cl(macmd)
+				
 
 if __name__ == "__main__":
 	if len(sys.argv) < 2: