ukamnya
/
pyst2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

python3 agi get_result

master
inpos 2017-03-01 21:43:02 +03:00
parent 386574d8ac
commit f45bc1f1c5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asterisk/agi.py
View File

@ -104,11 +104,9 @@ class AGI:
def _get_agi_env(self): def _get_agi_env(self):
while 1: while 1:
line = self.stdin.readline().strip()
if PY3: if PY3:
line = self.stdin.readline().strip()
if type(line) is bytes: line = line.decode('utf8') if type(line) is bytes: line = line.decode('utf8')
else:
line = self.stdin.readline().strip()
self.stderr.write('ENV LINE: ') self.stderr.write('ENV LINE: ')
self.stderr.write(line) self.stderr.write(line)
self.stderr.write('\n') self.stderr.write('\n')
@ -176,6 +174,8 @@ class AGI:
code = 0 code = 0
result = {'result': ('', '')} result = {'result': ('', '')}
line = self.stdin.readline().strip() line = self.stdin.readline().strip()
if PY3:
if type(line) is bytes: line = line.decode('utf8')
self.stderr.write(' RESULT_LINE: %s\n' % line) self.stderr.write(' RESULT_LINE: %s\n' % line)
m = re_code.search(line) m = re_code.search(line)
if m: if m:
@ -203,6 +203,8 @@ class AGI:
while line[:3] != '520': while line[:3] != '520':
usage.append(line) usage.append(line)
line = self.stdin.readline().strip() line = self.stdin.readline().strip()
if PY3:
if type(line) is bytes: line = line.decode('utf8')
usage.append(line) usage.append(line)
usage = '%s\n' % '\n'.join(usage) usage = '%s\n' % '\n'.join(usage)
raise AGIUsageError(usage) raise AGIUsageError(usage)