fix stop wait_thread

develop
Спиридонов Денис 12 years ago
parent 7b679eda51
commit c565956ace

@ -356,7 +356,6 @@ def main(wait_thread):
url = "https://%s:%d/?wsdl" %(host, port)
clear()
serv_hostname = get_server_hostname(host, path_to_cert)
get_name_flag = False
if serv_hostname:
@ -392,6 +391,10 @@ def main(wait_thread):
clVarsCore, wait_thread)
except urllib2.URLError, e:
print _('Error: '), e
except KeyboardInterrupt:
wait_thread.stop()
red = '\n'+'\033[31m * \033[0m'
print red + _('Interrupted by the user')
except Exception, e:
wait_thread.stop()
if type(e.message) != int:
@ -408,6 +411,10 @@ def main(wait_thread):
_print (f.fault)
except TransportError, te:
print _("Exception: %s") %te
except KeyboardInterrupt:
wait_thread.stop()
red = '\n'+'\033[31m * \033[0m'
print red + _('Interrupted by the user')
except Exception, e:
print _("Exception: %s") %e
tb.print_exc()
@ -425,6 +432,10 @@ def main(wait_thread):
wait_thread.stop()
print '\b' + _('Failed to connect')+':', e
return 1
except KeyboardInterrupt:
wait_thread.stop()
red = '\n'+'\033[31m * \033[0m'
print red + _('Interrupted by the user')
try:
import glob
@ -482,6 +493,10 @@ def main(wait_thread):
clVarsCore, wait_thread)
except urllib2.URLError, e:
print _('Error: '), e
except KeyboardInterrupt:
wait_thread.stop()
red = '\n'+'\033[31m * \033[0m'
print red + _('Interrupted by the user')
except Exception, e:
wait_thread.stop()
if type(e.message) != int:
@ -499,6 +514,10 @@ def main(wait_thread):
_print (f.fault)
except TransportError, te:
print _("Exception: %s") %te
except KeyboardInterrupt:
wait_thread.stop()
red = '\n'+'\033[31m * \033[0m'
print red + _('Interrupted by the user')
except Exception, e:
print _("Exception: %s") %e
tb.print_exc()

Loading…
Cancel
Save