Merge branch 'mokaddem-testing'

This commit is contained in:
Mokaddem 2016-07-12 11:53:24 +02:00
commit c51bdec8aa

View file

@ -19,11 +19,11 @@ import ipaddress
from Helper import Process from Helper import Process
# Used to prevent concat with empty fields due to url parsing # Used to prevent concat with empty fields due to url parsing
def avoidNone(str): def avoidNone(a_string):
if str is None: if a_string is None:
return "" return ""
else: else:
return str return a_string
if __name__ == "__main__": if __name__ == "__main__":
publisher.port = 6380 publisher.port = 6380