Merge branch 'master' into Develop
# Conflicts: # cps/server.py
This commit is contained in:
		
						commit
						3cb9a9b04a
					
				| 
						 | 
					@ -152,7 +152,7 @@ class WebServer(object):
 | 
				
			||||||
        # The value of __package__ indicates how Python was called. It may
 | 
					        # The value of __package__ indicates how Python was called. It may
 | 
				
			||||||
        # not exist if a setuptools script is installed as an egg. It may be
 | 
					        # not exist if a setuptools script is installed as an egg. It may be
 | 
				
			||||||
        # set incorrectly for entry points created with pip on Windows.
 | 
					        # set incorrectly for entry points created with pip on Windows.
 | 
				
			||||||
        if getattr(__main__, "__package__", "") == "" or (
 | 
					        if getattr(__main__, "__package__", "") in ["", None] or (
 | 
				
			||||||
            os.name == "nt"
 | 
					            os.name == "nt"
 | 
				
			||||||
            and __main__.__package__ == ""
 | 
					            and __main__.__package__ == ""
 | 
				
			||||||
            and not os.path.exists(py_script)
 | 
					            and not os.path.exists(py_script)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user