Fix test on return value of request_server
This commit is contained in:
1 parent
b358123987
commit
84e9542d2d
3 files changed
+12
-5
No files matched your search
+3
-2
@@ -781,9 +781,10 @@ class Main(object):
|
||||
|
||||
def refreshlist_ask(widget, server_widget, db_widget, label,
|
||||
parent=None):
|
||||
host, port = common.request_server(server_widget, parent)
|
||||
if not url:
|
||||
res = common.request_server(server_widget, parent)
|
||||
if not res:
|
||||
return None
|
||||
host, port = res
|
||||
refreshlist(widget, db_widget, label, host, port)
|
||||
return (host, port)
|
||||
|
||||
|
||||
@@ -24,7 +24,10 @@ class DBCreate(object):
|
||||
return sensitive
|
||||
|
||||
def server_change(self, widget, parent):
|
||||
host, port = common.request_server(self.server_widget, parent)
|
||||
res = common.request_server(self.server_widget, parent)
|
||||
if not res:
|
||||
return False
|
||||
host, port = res
|
||||
try:
|
||||
if self.lang_widget and host and port:
|
||||
common.refresh_langlist(self.lang_widget, host, port)
|
||||
@@ -32,7 +35,7 @@ class DBCreate(object):
|
||||
except:
|
||||
self.set_sensitive(False)
|
||||
return False
|
||||
return url
|
||||
return True
|
||||
|
||||
def __init__(self, sig_login):
|
||||
self.dialog = glade.XML(GLADE, "win_createdb", gettext.textdomain())
|
||||
|
||||
@@ -122,7 +122,10 @@ class DBLogin(object):
|
||||
@staticmethod
|
||||
def refreshlist_ask(widget, server_widget, db_widget, label,
|
||||
butconnect=False, host=False, port=0, parent=None):
|
||||
host, port = common.request_server(server_widget, parent) or (host, port)
|
||||
res = common.request_server(server_widget, parent) or (host, port)
|
||||
if not res:
|
||||
return False
|
||||
host, port = res
|
||||
return DBLogin.refreshlist(widget, db_widget, label, host, port,
|
||||
butconnect)
|
||||
|
||||
|
||||
Reference in new issue
Block a user