one layer of polish

[tests.git] / system / TestKey.py

diff --git a/system/TestKey.py b/system/TestKey.py
index 4ff08ff..2f4958d 100644 (file)
--- a/system/TestKey.py
+++ b/system/TestKey.py
@@ -7,44 +7,30 @@ from TestSsh import TestSsh
 
 class TestKey:
 
-    def __init__ (self,test_plc,key_spec):
-       self.test_plc=test_plc
-       self.key_spec=key_spec
-        self.test_ssh=TestSsh(self.test_plc.test_ssh)
+    def __init__ (self, test_plc, key_spec):
+       self.test_plc = test_plc
+       self.key_spec = key_spec
+        self.test_ssh = TestSsh(self.test_plc.test_ssh)
         
     def name(self):
         return self.key_spec['key_name']
 
     def publicpath(self):
-        return "keys/%s.pub"%(self.name())
+        return "keys/{}.pub".format(self.name())
     def privatepath(self):
-        return "keys/%s.rsa"%(self.name())
+        return "keys/{}.rsa".format(self.name())
 
-#Not tested yet, don't know if needed
-#    def store_remote_key(self,hostname):
-#        pub=self.publicpath()
-#        priv=self.privatepath()
-#        utils.header("Storing key %s in %s into %s "%(self.name(),pub,hostname))
-#        dir=os.path.dirname(pub)
-#        self.test_ssh.run("mkdir %s"%dir)
-#        self.test_ssh.run("cat %s >> %s"%(self.key_spec['key_fields']['key'],pub))
-#        self.test_ssh.run("cat %s >> %s"%(self.key_spec['private'],priv))
-#        self.test_ssh.run("chmod %s 0400"%priv)
-#        self.test_ssh.run("chmod %s 0444"%pub)
-            
     def store_key(self):
-        pub=self.publicpath()
-        priv=self.privatepath()
-        utils.header("Storing key %s in %s"%(self.name(),pub))
-        dir=os.path.dirname(pub)
+        pub = self.publicpath()
+        priv = self.privatepath()
+        utils.header("Storing key {} in {}".format(self.name(), pub))
+        dir = os.path.dirname(pub)
         if not os.path.isdir(dir):
             os.mkdir(dir)
-        f=open(pub,"w")
-        f.write(self.key_spec['key_fields']['key'])
-        f.close()
-        f=open(priv,"w")
-        f.write(self.key_spec['private'])
-        f.close()
+        with open(pub,"w") as f:
+            f.write(self.key_spec['key_fields']['key'])
+        with open(priv,"w") as f:
+            f.write(self.key_spec['private'])
         os.chmod(priv,0400)
         os.chmod(pub,0444)