Skip to content
This repository was archived by the owner on Aug 28, 2020. It is now read-only.

Commit 5d87c53

Browse files
committed
Merge pull request #85 from robertbasic/fix/issue58
Fix/issue58. Fixes #58
2 parents 67c59d6 + d144fb7 commit 5d87c53

File tree

3 files changed

+18
-5
lines changed

3 files changed

+18
-5
lines changed

pugdebug/debugger.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ class PugdebugDebugger(QObject):
3434
expression_evaluated_signal = pyqtSignal(int, dict)
3535
expressions_evaluated_signal = pyqtSignal(list)
3636

37+
error_signal = pyqtSignal(str)
38+
3739
def __init__(self):
3840
"""Init the debugger object
3941
@@ -111,9 +113,12 @@ def handle_server_connected(self, init_message):
111113
112114
Emit a debugging started signal.
113115
"""
114-
self.init_message = init_message
116+
if 'error' not in init_message:
117+
self.init_message = init_message
115118

116-
self.debugging_started_signal.emit()
119+
self.debugging_started_signal.emit()
120+
else:
121+
self.error_signal.emit(init_message['error'])
117122

118123
def cancel_debug(self):
119124
self.server.cancel()

pugdebug/pugdebug.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
__author__ = "robertbasic"
1111

1212
from PyQt5.QtCore import QObject
13+
from PyQt5.QtWidgets import QErrorMessage
1314

1415
from pugdebug.debugger import PugdebugDebugger
1516
from pugdebug.syntaxer import PugdebugFormatter
@@ -172,6 +173,10 @@ def connect_debugger_signals(self):
172173
self.handle_expressions_evaluated
173174
)
174175

176+
self.debugger.error_signal.connect(
177+
self.handle_error
178+
)
179+
175180
def connect_expression_viewer_signals(self):
176181
self.expression_viewer.expression_added_signal.connect(
177182
self.handle_expression_added_or_changed
@@ -616,6 +621,10 @@ def handle_expression_added_or_changed(self, index, expression):
616621
if self.debugger.is_connected():
617622
self.debugger.evaluate_expression(index, expression)
618623

624+
def handle_error(self, error):
625+
em = QErrorMessage(self.main_window)
626+
em.showMessage(error)
627+
619628
def __get_path_mapped_to_local(self, path, map_paths=True):
620629
"""Get a path mapped to local
621630

pugdebug/server.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,8 @@ def __connect_server(self):
250250
self.wait_for_accept = False
251251
self.is_waiting = False
252252

253-
except OSError:
254-
print(OSError.strerror())
255-
print("Socket bind failed")
253+
except OSError as e:
254+
response = {'error': e.strerror}
256255
finally:
257256
socket_server.close()
258257

0 commit comments

Comments
 (0)