LBRYCommunity/buildozer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #133 from FeralBytes/master

Browse source 
Make pexpect.py Python 3 Compatable
This commit is contained in:
Mathieu Virbel 2014-09-22 20:47:44 +02:00
commit 142ca87ed5
1 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
buildozer/libs/pexpect.py
View file

@ -78,7 +78,7 @@ try:
import errno import errno
import traceback import traceback
import signal import signal
except ImportError, e: except ImportError as e:
raise ImportError (str(e) + """ raise ImportError (str(e) + """
A critical module was not found. Probably this operating system does not A critical module was not found. Probably this operating system does not
@ -246,10 +246,10 @@ def run (command, timeout=-1, withexitstatus=False, events=None, extra_args=None
else: else:
raise TypeError ('The callback must be a string or function type.') raise TypeError ('The callback must be a string or function type.')
event_count = event_count + 1 event_count = event_count + 1
except TIMEOUT, e: except TIMEOUT as e:
child_result_list.append(child.before) child_result_list.append(child.before)
break break
except EOF, e: except EOF as e:
child_result_list.append(child.before) child_result_list.append(child.before)
break break
child_result = ''.join(child_result_list) child_result = ''.join(child_result_list)
@ -525,7 +525,7 @@ class spawn (object):
if self.use_native_pty_fork: if self.use_native_pty_fork:
try: try:
self.pid, self.child_fd = pty.fork() self.pid, self.child_fd = pty.fork()
except OSError, e: except OSError as e:
raise ExceptionPexpect('Error! pty.fork() failed: ' + str(e)) raise ExceptionPexpect('Error! pty.fork() failed: ' + str(e))
else: # Use internal __fork_pty else: # Use internal __fork_pty
self.pid, self.child_fd = self.__fork_pty() self.pid, self.child_fd = self.__fork_pty()
@ -581,11 +581,11 @@ class spawn (object):
parent_fd, child_fd = os.openpty() parent_fd, child_fd = os.openpty()
if parent_fd < 0 or child_fd < 0: if parent_fd < 0 or child_fd < 0:
raise ExceptionPexpect, "Error! Could not open pty with os.openpty()." raise ExceptionPexpect("Error! Could not open pty with os.openpty().")
pid = os.fork() pid = os.fork()
if pid < 0: if pid < 0:
raise ExceptionPexpect, "Error! Failed os.fork()." raise ExceptionPexpect("Error! Failed os.fork().")
elif pid == 0: elif pid == 0:
# Child. # Child.
os.close(parent_fd) os.close(parent_fd)
@ -623,7 +623,7 @@ class spawn (object):
fd = os.open("/dev/tty", os.O_RDWR | os.O_NOCTTY); fd = os.open("/dev/tty", os.O_RDWR | os.O_NOCTTY);
if fd >= 0: if fd >= 0:
os.close(fd) os.close(fd)
raise ExceptionPexpect, "Error! We are not disconnected from a controlling tty." raise ExceptionPexpect("Error! We are not disconnected from a controlling tty.")
except: except:
# Good! We are disconnected from a controlling tty. # Good! We are disconnected from a controlling tty.
pass pass
@ -631,14 +631,14 @@ class spawn (object):
# Verify we can open child pty. # Verify we can open child pty.
fd = os.open(child_name, os.O_RDWR); fd = os.open(child_name, os.O_RDWR);
if fd < 0: if fd < 0:
raise ExceptionPexpect, "Error! Could not open child pty, " + child_name raise ExceptionPexpect("Error! Could not open child pty, " + child_name)
else: else:
os.close(fd) os.close(fd)
# Verify we now have a controlling tty. # Verify we now have a controlling tty.
fd = os.open("/dev/tty", os.O_WRONLY) fd = os.open("/dev/tty", os.O_WRONLY)
if fd < 0: if fd < 0:
raise ExceptionPexpect, "Error! Could not open controlling tty, /dev/tty" raise ExceptionPexpect("Error! Could not open controlling tty, /dev/tty")
else: else:
os.close(fd) os.close(fd)
@ -826,7 +826,7 @@ class spawn (object):
if self.child_fd in r: if self.child_fd in r:
try: try:
s = os.read(self.child_fd, size) s = os.read(self.child_fd, size)
except OSError, e: # Linux does this except OSError as e: # Linux does this
self.flag_eof = True self.flag_eof = True
raise EOF ('End Of File (EOF) in read_nonblocking(). Exception style platform.') raise EOF ('End Of File (EOF) in read_nonblocking(). Exception style platform.')
if s == '': # BSD style if s == '': # BSD style
@ -834,10 +834,10 @@ class spawn (object):
raise EOF ('End Of File (EOF) in read_nonblocking(). Empty string style platform.') raise EOF ('End Of File (EOF) in read_nonblocking(). Empty string style platform.')
if self.logfile is not None: if self.logfile is not None:
self.logfile.write (s) self.logfile.write (s.decode(encoding='UTF-8'))
self.logfile.flush() self.logfile.flush()
if self.logfile_read is not None: if self.logfile_read is not None:
self.logfile_read.write (s) self.logfile_read.write (s.decode(encoding='UTF-8'))
self.logfile_read.flush() self.logfile_read.flush()
return s return s
@ -950,7 +950,7 @@ class spawn (object):
if self.logfile_send is not None: if self.logfile_send is not None:
self.logfile_send.write (s) self.logfile_send.write (s)
self.logfile_send.flush() self.logfile_send.flush()
c = os.write(self.child_fd, s) c = os.write(self.child_fd, s.encode(encoding='UTF-8'))
return c return c
def sendline(self, s=''): def sendline(self, s=''):
@ -1071,7 +1071,7 @@ class spawn (object):
else: else:
return False return False
return False return False
except OSError, e: except OSError as e:
# I think there are kernel timing issues that sometimes cause # I think there are kernel timing issues that sometimes cause
# this to happen. I think isalive() reports True, but the # this to happen. I think isalive() reports True, but the
# process is dead to the kernel. # process is dead to the kernel.
@ -1130,7 +1130,7 @@ class spawn (object):
try: try:
pid, status = os.waitpid(self.pid, waitpid_options) pid, status = os.waitpid(self.pid, waitpid_options)
except OSError, e: # No child processes except OSError as e: # No child processes
if e[0] == errno.ECHILD: if e[0] == errno.ECHILD:
raise ExceptionPexpect ('isalive() encountered condition where "terminated" is 0, but there was no child process. Did someone else call waitpid() on our process?') raise ExceptionPexpect ('isalive() encountered condition where "terminated" is 0, but there was no child process. Did someone else call waitpid() on our process?')
else: else:
@ -1142,7 +1142,7 @@ class spawn (object):
if pid == 0: if pid == 0:
try: try:
pid, status = os.waitpid(self.pid, waitpid_options) ### os.WNOHANG) # Solaris! pid, status = os.waitpid(self.pid, waitpid_options) ### os.WNOHANG) # Solaris!
except OSError, e: # This should never happen... except OSError as e: # This should never happen...
if e[0] == errno.ECHILD: if e[0] == errno.ECHILD:
raise ExceptionPexpect ('isalive() encountered condition that should never happen. There was no child process. Did someone else call waitpid() on our process?') raise ExceptionPexpect ('isalive() encountered condition that should never happen. There was no child process. Did someone else call waitpid() on our process?')
else: else:
@ -1209,7 +1209,7 @@ class spawn (object):
if patterns is None: if patterns is None:
return [] return []
if type(patterns) is not types.ListType: if type(patterns) is not list:
patterns = [patterns] patterns = [patterns]
compile_flags = re.DOTALL # Allow dot to match \n compile_flags = re.DOTALL # Allow dot to match \n
@ -1217,7 +1217,7 @@ class spawn (object):
compile_flags = compile_flags | re.IGNORECASE compile_flags = compile_flags | re.IGNORECASE
compiled_pattern_list = [] compiled_pattern_list = []
for p in patterns: for p in patterns:
if type(p) in types.StringTypes: if type(p) in (str,bytes):
compiled_pattern_list.append(re.compile(p, compile_flags)) compiled_pattern_list.append(re.compile(p, compile_flags))
elif p is EOF: elif p is EOF:
compiled_pattern_list.append(EOF) compiled_pattern_list.append(EOF)
@ -1372,16 +1372,16 @@ class spawn (object):
self.match_index = index self.match_index = index
return self.match_index return self.match_index
# No match at this point # No match at this point
if timeout < 0 and timeout is not None: if timeout is not None and timeout < 0:
raise TIMEOUT ('Timeout exceeded in expect_any().') raise TIMEOUT ('Timeout exceeded in expect_any().')
# Still have time left, so read more data # Still have time left, so read more data
c = self.read_nonblocking (self.maxread, timeout) c = self.read_nonblocking (self.maxread, timeout)
freshlen = len(c) freshlen = len(c)
time.sleep (0.0001) time.sleep (0.0001)
incoming = incoming + c incoming = incoming + c.decode(encoding='UTF-8')
if timeout is not None: if timeout is not None:
timeout = end_time - time.time() timeout = end_time - time.time()
except EOF, e: except EOF as e:
self.buffer = '' self.buffer = ''
self.before = incoming self.before = incoming
self.after = EOF self.after = EOF
@ -1394,7 +1394,7 @@ class spawn (object):
self.match = None self.match = None
self.match_index = None self.match_index = None
raise EOF (str(e) + '\n' + str(self)) raise EOF (str(e) + '\n' + str(self))
except TIMEOUT, e: except TIMEOUT as e:
self.buffer = incoming self.buffer = incoming
self.before = incoming self.before = incoming
self.after = TIMEOUT self.after = TIMEOUT
@ -1419,7 +1419,7 @@ class spawn (object):
"""This returns the terminal window size of the child tty. The return """This returns the terminal window size of the child tty. The return
value is a tuple of (rows, cols). """ value is a tuple of (rows, cols). """
TIOCGWINSZ = getattr(termios, 'TIOCGWINSZ', 1074295912L) TIOCGWINSZ = getattr(termios, 'TIOCGWINSZ', 1074295912)
s = struct.pack('HHHH', 0, 0, 0, 0) s = struct.pack('HHHH', 0, 0, 0, 0)
x = fcntl.ioctl(self.fileno(), TIOCGWINSZ, s) x = fcntl.ioctl(self.fileno(), TIOCGWINSZ, s)
return struct.unpack('HHHH', x)[0:2] return struct.unpack('HHHH', x)[0:2]
@ -1441,7 +1441,7 @@ class spawn (object):
# Newer versions of Linux have totally different values for TIOCSWINSZ. # Newer versions of Linux have totally different values for TIOCSWINSZ.
# Note that this fix is a hack. # Note that this fix is a hack.
TIOCSWINSZ = getattr(termios, 'TIOCSWINSZ', -2146929561) TIOCSWINSZ = getattr(termios, 'TIOCSWINSZ', -2146929561)
if TIOCSWINSZ == 2148037735L: # L is not required in Python >= 2.2. if TIOCSWINSZ == 2148037735: # L is not required in Python >= 2.2.
TIOCSWINSZ = -2146929561 # Same bits, but with sign. TIOCSWINSZ = -2146929561 # Same bits, but with sign.
# Note, assume ws_xpixel and ws_ypixel are zero. # Note, assume ws_xpixel and ws_ypixel are zero.
s = struct.pack('HHHH', r, c, 0, 0) s = struct.pack('HHHH', r, c, 0, 0)
@ -1547,7 +1547,7 @@ class spawn (object):
while True: while True:
try: try:
return select.select (iwtd, owtd, ewtd, timeout) return select.select (iwtd, owtd, ewtd, timeout)
except select.error, e: except select.error as e:
if e[0] == errno.EINTR: if e[0] == errno.EINTR:
# if we loop back we have to subtract the amount of time we already waited. # if we loop back we have to subtract the amount of time we already waited.
if timeout is not None: if timeout is not None: