copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

two small errors on win

This commit is contained in:
Dimitur Kirov 2006-02-05 15:31:31 +00:00
parent 9834fd62d3
commit 8df5e7efce
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/nslookup.py
View File

@ -24,7 +24,7 @@
import sys, os, sre import sys, os, sre
from xmpp.idlequeue import IdleObject, IdleQueue from xmpp.idlequeue import *
if os.name == 'nt': if os.name == 'nt':
from subprocess import * from subprocess import *
elif os.name == 'posix': elif os.name == 'posix':
@ -205,6 +205,7 @@ class IdleCommand(IdleObject):
if self.endtime < self.idlequeue.current_time(): if self.endtime < self.idlequeue.current_time():
self._return_result() self._return_result()
self.pipe.stdout.close() self.pipe.stdout.close()
self.pipe.stdin.close()
else: else:
# child is still active, continue to wait # child is still active, continue to wait
self.idlequeue.set_alarm(self.wait_child, 0.1) self.idlequeue.set_alarm(self.wait_child, 0.1)
@ -230,7 +231,7 @@ class IdleCommand(IdleObject):
self.pipe = Popen(self._compose_command_args(), stdout=PIPE, self.pipe = Popen(self._compose_command_args(), stdout=PIPE,
bufsize = 1024, shell = True, stderr = STDOUT, stdin = PIPE) bufsize = 1024, shell = True, stderr = STDOUT, stdin = PIPE)
if self.commandtimeout >= 0: if self.commandtimeout >= 0:
self.endtime = self.idlequeue.current_time() self.endtime = self.idlequeue.current_time() + self.commandtimeout
self.idlequeue.set_alarm(self.wait_child, 0.1) self.idlequeue.set_alarm(self.wait_child, 0.1)
def _start_posix(self): def _start_posix(self):
@ -270,7 +271,7 @@ class IdleCommand(IdleObject):
class NsLookup(IdleCommand): class NsLookup(IdleCommand):
def __init__(self, on_result, host='_xmpp-client', type = 'srv'): def __init__(self, on_result, host='_xmpp-client', type = 'srv'):
IdleCommand.__init__(self, on_result) IdleCommand.__init__(self, on_result)
self.commandtimeout = 30 self.commandtimeout = 10
self.host = host.lower() self.host = host.lower()
self.type = type.lower() self.type = type.lower()
if not host_pattern.match(self.host): if not host_pattern.match(self.host):
@ -296,12 +297,14 @@ class NsLookup(IdleCommand):
# TODO: remove below lines if there is nothing more to test # TODO: remove below lines if there is nothing more to test
if __name__ == '__main__': if __name__ == '__main__':
if os.name != 'posix': if os.name == 'posix':
sys.exit() idlequeue = IdleQueue()
elif os.name == 'nt':
idlequeue = SelectIdleQueue()
# testing Resolver class # testing Resolver class
import gobject import gobject
import gtk import gtk
idlequeue = IdleQueue()
resolver = Resolver(idlequeue) resolver = Resolver(idlequeue)
def clicked(widget): def clicked(widget):