Merge branch 'lixuefeng2-for_format' into develop

Locally merging #880 to fix code style issue (missing whitespace).

Note: the PR had an unwanted documentation patch that is excluded
from this merge.

Signed-off-by: Lukas Puehringer <[email protected]>

Author: lukpueh

tests/test_arbitrary_package_attack.py

@@ -83,9 +83,9 @@ def setUpClass(cls):
     command = ['python', 'simple_server.py', str(cls.SERVER_PORT)]
     cls.server_process = subprocess.Popen(command, stderr=subprocess.PIPE)
     logger.info('Server process started.')
-    logger.info('Server process id: '+str(cls.server_process.pid))
-    logger.info('Serving on port: '+str(cls.SERVER_PORT))
-    cls.url = 'http://localhost:'+str(cls.SERVER_PORT) + os.path.sep
+    logger.info('Server process id: ' + str(cls.server_process.pid))
+    logger.info('Serving on port: ' + str(cls.SERVER_PORT))
+    cls.url = 'http://localhost:' + str(cls.SERVER_PORT) + os.path.sep
 
     # NOTE: Following error is raised if a delay is not applied:
     # <urlopen error [Errno 111] Connection refused>
@@ -104,7 +104,7 @@ def tearDownClass(cls):
 
     # Kill the SimpleHTTPServer process.
     if cls.server_process.returncode is None:
-      logger.info('Server process '+str(cls.server_process.pid)+' terminated.')
+      logger.info('Server process ' + str(cls.server_process.pid) + ' terminated.')
       cls.server_process.kill()