diff options
Diffstat (limited to 'bitbake/lib/prserv/serv.py')
| -rw-r--r-- | bitbake/lib/prserv/serv.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bitbake/lib/prserv/serv.py b/bitbake/lib/prserv/serv.py index 8cec9f8870..cafcc820cd 100644 --- a/bitbake/lib/prserv/serv.py +++ b/bitbake/lib/prserv/serv.py | |||
| @@ -1,10 +1,10 @@ | |||
| 1 | import os,sys,logging | 1 | import os,sys,logging |
| 2 | import signal, time | 2 | import signal, time |
| 3 | from SimpleXMLRPCServer import SimpleXMLRPCServer, SimpleXMLRPCRequestHandler | 3 | from xmlrpc.server import SimpleXMLRPCServer, SimpleXMLRPCRequestHandler |
| 4 | import threading | 4 | import threading |
| 5 | import Queue | 5 | import queue |
| 6 | import socket | 6 | import socket |
| 7 | import StringIO | 7 | import io |
| 8 | 8 | ||
| 9 | try: | 9 | try: |
| 10 | import sqlite3 | 10 | import sqlite3 |
| @@ -64,7 +64,7 @@ class PRServer(SimpleXMLRPCServer): | |||
| 64 | self.register_function(self.importone, "importone") | 64 | self.register_function(self.importone, "importone") |
| 65 | self.register_introspection_functions() | 65 | self.register_introspection_functions() |
| 66 | 66 | ||
| 67 | self.requestqueue = Queue.Queue() | 67 | self.requestqueue = queue.Queue() |
| 68 | self.handlerthread = threading.Thread(target = self.process_request_thread) | 68 | self.handlerthread = threading.Thread(target = self.process_request_thread) |
| 69 | self.handlerthread.daemon = False | 69 | self.handlerthread.daemon = False |
| 70 | 70 | ||
| @@ -83,7 +83,7 @@ class PRServer(SimpleXMLRPCServer): | |||
| 83 | while not self.quit: | 83 | while not self.quit: |
| 84 | try: | 84 | try: |
| 85 | (request, client_address) = self.requestqueue.get(True, 30) | 85 | (request, client_address) = self.requestqueue.get(True, 30) |
| 86 | except Queue.Empty: | 86 | except queue.Empty: |
| 87 | self.table.sync_if_dirty() | 87 | self.table.sync_if_dirty() |
| 88 | continue | 88 | continue |
| 89 | try: | 89 | try: |
| @@ -126,7 +126,7 @@ class PRServer(SimpleXMLRPCServer): | |||
| 126 | Returns None if the database engine does not support dumping to | 126 | Returns None if the database engine does not support dumping to |
| 127 | script or if some other error is encountered in processing. | 127 | script or if some other error is encountered in processing. |
| 128 | """ | 128 | """ |
| 129 | buff = StringIO.StringIO() | 129 | buff = io.StringIO() |
| 130 | try: | 130 | try: |
| 131 | self.table.sync() | 131 | self.table.sync() |
| 132 | self.table.dump_db(buff) | 132 | self.table.dump_db(buff) |
| @@ -420,7 +420,7 @@ class PRServiceConfigError(Exception): | |||
| 420 | def auto_start(d): | 420 | def auto_start(d): |
| 421 | global singleton | 421 | global singleton |
| 422 | 422 | ||
| 423 | host_params = filter(None, (d.getVar('PRSERV_HOST', True) or '').split(':')) | 423 | host_params = list(filter(None, (d.getVar('PRSERV_HOST', True) or '').split(':'))) |
| 424 | if not host_params: | 424 | if not host_params: |
| 425 | return None | 425 | return None |
| 426 | 426 | ||
