Skip to content

Commit 1fa99cf

Browse files
author
llllllllll
committed
ENH: Python 3 tracer.
1 parent f2a75c0 commit 1fa99cf

File tree

5 files changed

+18
-3
lines changed

5 files changed

+18
-3
lines changed

qdb/comm.py

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
15+
from __future__ import print_function
16+
1517
from abc import ABCMeta, abstractmethod
1618
import atexit
1719
from bdb import Breakpoint
@@ -110,6 +112,7 @@ class CommandManager(object):
110112

111113
def __init__(self, tracer):
112114
self.tracer = tracer
115+
113116
if gevent is not None:
114117
import gipc # Only use gipc if we are running in gevent.
115118
self._pipe = gipc.pipe

qdb/compat.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,13 @@
2424

2525
PY3 = not PY2
2626

27-
2827
gevent = sys.modules.get('gevent')
2928

29+
try:
30+
import gevent
31+
except ImportError:
32+
gevent = None
33+
3034

3135
if PY2:
3236
try:
@@ -35,7 +39,6 @@
3539
from StringIO import StringIO
3640

3741
from contextlib2 import ExitStack
38-
3942
import itertools
4043

4144
filter = itertools.ifilter
@@ -90,6 +93,7 @@ def with_metaclass(metaclass, *bases):
9093
'StringIO',
9194
'gevent',
9295
'items',
96+
'keys',
9397
'range',
9498
'reduce',
9599
'zip',

qdb/tracer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from logbook import Logger, FileHandler
2424

2525
from qdb.comm import RemoteCommandManager, fmt_msg
26-
from qdb.compat import map, items, ExitStack
26+
from qdb.compat import map, items
2727
from qdb.config import QdbConfig
2828
from qdb.errors import QdbUnreachableBreakpoint, QdbQuit, QdbExecutionTimeout
2929
from qdb.output import RemoteOutput, OutputTee

setup.py

+1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
'Topic :: Software Development :: Debuggers',
6868
],
6969
install_requires=[
70+
'contextlib2',
7071
'Logbook',
7172
'websocket-client',
7273
] + py2_requires,

tests/test_cmd_manager.py

+7
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@ def send_stack(self):
253253
host=self.tracer_host,
254254
port=self.tracer_port,
255255
redirect_output=False,
256+
green=True,
256257
)
257258
sleep(0.01)
258259
if direction == 'down':
@@ -301,6 +302,7 @@ def pause_handler(signal, stackframe):
301302
cmd_manager=self.cmd_manager,
302303
host=self.tracer_host,
303304
port=self.tracer_port,
305+
green=True,
304306
)
305307
signal.signal(db.pause_signal, pause_handler)
306308
self.server.session_store.send_to_tracer(
@@ -341,6 +343,7 @@ def send_print(self, input_, exc, output):
341343
host=self.tracer_host,
342344
port=self.tracer_port,
343345
redirect_output=False,
346+
green=True,
344347
)
345348
sleep(0.01)
346349
self.server.session_store.send_to_tracer(
@@ -427,6 +430,7 @@ def test_eval_state_update(self):
427430
host=self.tracer_host,
428431
port=self.tracer_port,
429432
redirect_output=False,
433+
green=True,
430434
)
431435
sleep(0.01)
432436
self.server.session_store.send_to_tracer(
@@ -472,6 +476,7 @@ def send_print(self, input_, exc, output):
472476
port=self.tracer_port,
473477
redirect_output=False,
474478
execution_timeout=1,
479+
green=True,
475480
)
476481
sleep(0.01)
477482
self.server.session_store.send_to_tracer(
@@ -511,6 +516,7 @@ def send_disabled(self):
511516
host=self.tracer_host,
512517
port=self.tracer_port,
513518
redirect_output=False,
519+
green=True,
514520
)
515521
sleep(0.01)
516522
db.set_trace(stop=False)
@@ -550,6 +556,7 @@ def send_stack(self):
550556
port=self.tracer_port,
551557
redirect_output=False,
552558
skip_fn=skip_fn if use_skip_fn else None,
559+
green=True,
553560
)
554561
sleep(0.01)
555562
self.server.session_store.send_to_tracer(

0 commit comments

Comments
 (0)