grammar nazi

slapos/runner/runnertest.py

@@ -292,7 +292,8 @@ class SlaprunnerTestCase(unittest.TestCase):
     #Check git configuration
     config = open(os.path.join(realFolder, '.git/config')).read()
     assert "slaprunner@nexedi.com" in config and "Slaprunner test" in config
-    #Checkout to slaprunner branch, this supose that branch slaprunner exit
+
+    # Checkout to slaprunner branch, this supposes that branch slaprunner exit
     response = loadJson(self.app.post('/newBranch',
                                       data=dict(
                                         project=folder,
@@ -331,8 +332,9 @@ class SlaprunnerTestCase(unittest.TestCase):
     assert software in currentSR
     self.assertFalse(isInstanceRunning(self.app.config))
     self.assertFalse(isSoftwareRunning(self.app.config))
-    #Slapproxy process is supose to be started
-    #newSoftware = os.path.join(self.software, 'slaprunner-test')
+
+    # Slapproxy process is supposed to be started
+    # newSoftware = os.path.join(self.software, 'slaprunner-test')
     self.proxyStatus(True)
     self.stopSlapproxy()
     self.logout()
@@ -358,8 +360,9 @@ class SlaprunnerTestCase(unittest.TestCase):
                                                 content=softwareRelease),
                                       follow_redirects=True))
     self.assertEqual(response['result'], "")
-    #Compile software and wait until slapgrid it end
-    #this is supose to use curent SR
+
+    # Compile software and wait until slapgrid ends
+    # this is supposed to use current SR
     response = loadJson(self.app.post('/runSoftwareProfile',
                                       data=dict(),
                                       follow_redirects=True))

slapos/runner/utils.py

@@ -265,8 +265,8 @@ def runSoftwareWithLock(config):
 
 
 def config_SR_folder(config):
-  """Create a symbolik link for each folder in software folder. That allow
-    user to customize software release folder"""
+  """Create a symbolik link for each folder in software folder. That allows
+    the user to customize software release folder"""
   list = []
   # XXX-Marco do not shadow 'list'
   config_name = 'slaprunner.config'
@@ -280,8 +280,8 @@ def config_SR_folder(config):
   folder_list = os.listdir(config['software_root'])
   if len(folder_list) < 1:
     return
-  curent_project = open(os.path.join(config['etc_dir'], ".project")).read()
-  projects = curent_project.split("/")
+  current_project = open(os.path.join(config['etc_dir'], ".project")).read()
+  projects = current_project.split('/')
   name = projects[len(projects) - 2]
   for folder in folder_list:
     if folder in list:
@@ -297,7 +297,7 @@ def config_SR_folder(config):
       os.symlink(source, destination)
       #write config file
       cf = open(cfg, 'w')
-      cf.write(curent_project + "#" + folder)
+      cf.write(current_project + "#" + folder)
       cf.close()