Skip to content

Commit b0a2d5c

Browse files
Remove debug comments
1 parent 7db46a5 commit b0a2d5c

File tree

11 files changed

+75
-75
lines changed

11 files changed

+75
-75
lines changed

src/robotide/controller/ctrlcommands.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ def _in_for_loop(self):
9393
return isinstance(self._item.parent, ForLoopStepController)
9494

9595
def replace_keyword(self, new_name):
96-
print(f"DEBUG: ctrlcommands.py Occurrence replace_keyword BEFORE new_name={new_name} value={self._value}"
97-
f" self._replaced={self._replaced} item={self._item}")
96+
# print(f"DEBUG: ctrlcommands.py Occurrence replace_keyword BEFORE new_name={new_name} value={self._value}"
97+
# f" self._replaced={self._replaced} item={self._item}")
9898
self._item.replace_keyword(*self._get_replace_values(new_name))
9999
self._replaced = not self._replaced
100100

@@ -286,9 +286,9 @@ def __init__(self, original_name, new_name, observer, keyword_info=None):
286286
self._observer = observer
287287
self._keyword_info = keyword_info
288288
self._occurrences = None
289-
print(f"DEBUG: ctrlcommands.py RenameKeywordOccurrences INIT\n"
290-
f"{original_name=}, {new_name=}, self._original_name={self._original_name} "
291-
f"self._new_name={self._new_name} self._keyword_info={self._keyword_info} ")
289+
# print(f"DEBUG: ctrlcommands.py RenameKeywordOccurrences INIT\n"
290+
# f"{original_name=}, {new_name=}, self._original_name={self._original_name} "
291+
# f"self._new_name={self._new_name} self._keyword_info={self._keyword_info} ")
292292

293293
def _check_gherkin(self, new_name, original_name):
294294
was_gherkin, keyword_name = self._get_gherkin(original_name)
@@ -319,8 +319,8 @@ def _params(self):
319319
def _execute(self, context):
320320
self._observer.notify()
321321
self._occurrences = self._find_occurrences(context) if self._occurrences is None else self._occurrences
322-
print(f"DEBUG: ctlcommands.py RenameKeywordOccurrences _execute: found occurrences= {self._occurrences}\n"
323-
f"CONTEXT:{context}")
322+
# print(f"DEBUG: ctlcommands.py RenameKeywordOccurrences _execute: found occurrences= {self._occurrences}\n"
323+
# f"CONTEXT:{context}")
324324
self._replace_keywords_in(self._occurrences)
325325
context.update_namespace()
326326
self._notify_values_changed(self._occurrences, old_name=self._original_name)
@@ -342,12 +342,12 @@ def _replace_keywords_in(self, occurrences):
342342

343343
def _notify_values_changed(self, occurrences, old_name=None):
344344
for oc in occurrences:
345-
try:
346-
print(f"DEBUG: ctlcommands.py RenameKeywordOccurrences _notify_values_changed: "
347-
f"oc= {oc.source} {oc.item} {oc.usage} {oc._value}")
348-
except AttributeError:
349-
print(f"DEBUG: ctlcommands.py RenameKeywordOccurrences _notify_values_changed: "
350-
f" in AttributeError oc= {oc}")
345+
# try:
346+
# print(f"DEBUG: ctlcommands.py RenameKeywordOccurrences _notify_values_changed: "
347+
# f"oc= {oc.source} {oc.item} {oc.usage} {oc._value}")
348+
# except AttributeError:
349+
# print(f"DEBUG: ctlcommands.py RenameKeywordOccurrences _notify_values_changed: "
350+
# f" in AttributeError oc= {oc}")
351351
oc.notify_value_changed(old_name=old_name, new_name=self._new_name)
352352
self._observer.notify()
353353

src/robotide/controller/macrocontrollers.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ def contains_variable(self, name):
5353
return variablematcher.value_contains_variable(self._item.name, name)
5454

5555
def replace_keyword(self, new_name, old_value=None):
56-
print(f"DEBUG: macrocontrollers.py replace_keyword new_name={new_name} old_value={old_value}")
56+
# print(f"DEBUG: macrocontrollers.py replace_keyword new_name={new_name} old_value={old_value}")
5757
self._item.rename(new_name)
5858

5959
def rename(self, new_name):
6060
self._item.rename(new_name)
6161

6262
def notify_value_changed(self, old_name=None, new_name=None):
63-
print(f"DEBUG: macrocontrollers.py notify_value_changed item={self._item.name} old_name={old_name}")
63+
# print(f"DEBUG: macrocontrollers.py notify_value_changed item={self._item.name} old_name={old_name}")
6464
if not new_name:
6565
new_name=self._item.name
6666
self._item.notify_name_changed(old_name=old_name, new_name=new_name)
@@ -190,7 +190,7 @@ def delete(self):
190190
self.notify_keyword_removed()
191191

192192
def rename(self, new_name):
193-
print(f"DEBUG: macrocontrollers.py WithStepsController rename BEFORE new_name={new_name} old_name={self.data.name}")
193+
# print(f"DEBUG: macrocontrollers.py WithStepsController rename BEFORE new_name={new_name} old_name={self.data.name}")
194194
self.data.name = new_name.strip()
195195
self.mark_dirty()
196196

@@ -307,8 +307,8 @@ def notify_settings_changed(self, old_name=None, new_name=None):
307307

308308
def notify_steps_changed(self, old_name=None):
309309
self._has_steps_changed = True
310-
print(f"DEBUG: macrocontrollers.py WithStepsController notify_steps_changed: ENTER old_name={old_name}"
311-
f" {self.parent} {self.source} {self} call self._notify")
310+
# print(f"DEBUG: macrocontrollers.py WithStepsController notify_steps_changed: ENTER old_name={old_name}"
311+
# f" {self.parent} {self.source} {self} call self._notify")
312312
self._notify(RideItemStepsChanged)
313313

314314
def _notify(self, messageclass):

src/robotide/controller/stepcontrollers.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,8 @@ def replace_keyword(self, new_name, old_name):
309309
# DEBUG: Create setters for Step.name and Step.args
310310
new_match = self._kw_name_match(self.keyword or '', old_name)
311311
if new_match:
312-
print(f"DEBUG: stepcontrollers.py StepController replace_keyword: ACTUAL CHANGE old_name={old_name}"
313-
f" new_name={new_name} new_match={new_match}")
312+
# print(f"DEBUG: stepcontrollers.py StepController replace_keyword: ACTUAL CHANGE old_name={old_name}"
313+
# f" new_name={new_name} new_match={new_match}")
314314
self.step_controller_step.name = self.step_controller_step.cells[self.step_controller_step.inner_kw_pos] = \
315315
self._kw_name_replace(self.keyword, new_name, old_name)
316316
for index, value in enumerate(self.args):
@@ -321,8 +321,8 @@ def replace_keyword(self, new_name, old_name):
321321

322322
def _kw_name_replace(self, old_value, new_match, old_match):
323323
# Here we should have a match for keywords prefixed with resource name
324-
print(f"DEBUG: stepcontrollers.py StepController _kw_name_replace: ENTER old_value={old_value}"
325-
f" old_match={old_match} new_match={new_match}")
324+
# print(f"DEBUG: stepcontrollers.py StepController _kw_name_replace: ENTER old_value={old_value}"
325+
# f" old_match={old_match} new_match={new_match}")
326326
old_prefix_matcher = self._GIVEN_WHEN_THEN_MATCHER.match(old_value)
327327
if not old_prefix_matcher:
328328
return new_match
@@ -572,8 +572,8 @@ def _recreate_next_step(self, index):
572572
next_step.recreate(next_step.as_list())
573573

574574
def notify_value_changed(self, old_name=None, new_name=None):
575-
print(f"DEBUG: stepcontrollers.py StepController notify_value_changed: ENTER old_name={old_name}"
576-
f" parent={self.parent.name} new_name={new_name} calling self.parent.notify_steps_changed()")
575+
# print(f"DEBUG: stepcontrollers.py StepController notify_value_changed: ENTER old_name={old_name}"
576+
# f" parent={self.parent.name} new_name={new_name} calling self.parent.notify_steps_changed()")
577577
if old_name is not None:
578578
RideItemNameChanged(item=self, old_name=old_name, new_name=new_name).publish()
579579
self.parent.notify_steps_changed(old_name)

src/robotide/controller/ui/treecontroller.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def match_handler(n):
107107
return self._find_node_with_predicate(self._tree.root, match_handler)
108108

109109
def find_node_with_label(self, node, label):
110-
print(f"DEBUG: treecontroller.py TreeController find_node_with_label node={node} LABEL={label}")
110+
# print(f"DEBUG: treecontroller.py TreeController find_node_with_label node={node} LABEL={label}")
111111
def matcher(n): return utils.eq(self._tree.GetItemText(n), label)
112112
return self._find_node_with_predicate(node, matcher)
113113

src/robotide/editor/macroeditors.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ def _create_kweditor(self):
3939
self._editors.append(self.kweditor)
4040

4141
def _name_changed(self, message):
42-
print(f"DEBUG: macroeditors.py TestCaseEditor _name_changed ENTER {message}\n")
42+
# print(f"DEBUG: macroeditors.py TestCaseEditor _name_changed ENTER {message}\n")
4343
if message.item == self.controller:
4444
self.header.SetLabel(message.item.name)
45-
print(f"DEBUG: macroeditors.py TestCaseEditor _name_changed DONE {message.item.name=} {self.controller}")
45+
# print(f"DEBUG: macroeditors.py TestCaseEditor _name_changed DONE {message.item.name=} {self.controller}")
4646

4747
def close(self):
4848
for editor in self._editors:

src/robotide/ui/treenodehandlers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -748,8 +748,8 @@ def _add_copy_to_tree(self, parent_node, copied):
748748
self._tree.add_keyword(parent_node, copied)
749749

750750
def _create_rename_command(self, new_name):
751-
print(f"DEBUG: treenodehandlers.py UserKeywodHandler _create_rename_command controller.name={self.controller.name}"
752-
f", new_name={new_name} info={self.controller.info}")
751+
# print(f"DEBUG: treenodehandlers.py UserKeywodHandler _create_rename_command controller.name={self.controller.name}"
752+
# f", new_name={new_name} info={self.controller.info}")
753753
return ctrlcommands.RenameKeywordOccurrences(
754754
self.controller.name, new_name,
755755
RenameProgressObserver(self._tree.GetParent()),

src/robotide/ui/treeplugin.py

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -688,8 +688,8 @@ def _filename_changed(self, message):
688688
if not node:
689689
raise AssertionError('No node found with controller "%s"' % df)
690690
old_name = node.GetText()
691-
print(f"DEBUG: treeplugin.py Tree _filename_changed message={message} df={df}"
692-
f" node={node} {old_name=} df.display_name={df.display_name}")
691+
# print(f"DEBUG: treeplugin.py Tree _filename_changed message={message} df={df}"
692+
# f" node={node} {old_name=} df.display_name={df.display_name}")
693693
wx.CallAfter(self.SetItemText, node, df.display_name)
694694
if isinstance(df, ResourceFileController):
695695
RideItemNameChanged(item=node, old_name=old_name, new_name=df.display_name).publish()
@@ -745,7 +745,7 @@ def select_user_keyword_node(self, uk):
745745
if not self.IsExpanded(parent_node):
746746
self._expand_and_render_children(parent_node)
747747
node = self.controller.find_node_with_label(parent_node, utils.normalize(uk.name))
748-
print(f"DEBUG: treeplugin.py Tree select_user_keyword_node node= {node}")
748+
# print(f"DEBUG: treeplugin.py Tree select_user_keyword_node node= {node}")
749749
if node != self.GetSelection():
750750
self.SelectItem(node)
751751

@@ -1095,9 +1095,9 @@ def on_move_down(self, event):
10951095
handler.on_move_down(event)
10961096

10971097
def _item_changed(self, message):
1098-
print(f"DEBUG: treeplugin.py Tree _item_changed ENTER message={message}")
1099-
# if isinstance(message, RideItemNameChanged):
1100-
# return
1098+
# print(f"DEBUG: treeplugin.py Tree _item_changed ENTER message={message}")
1099+
if isinstance(message, RideItemNameChanged):
1100+
return
11011101
controller = message.item
11021102
node = self.controller.find_node_by_controller(controller)
11031103
if node:
@@ -1107,29 +1107,29 @@ def _item_changed(self, message):
11071107

11081108
def _item_renamed(self, message):
11091109
from ..lib.robot.parsing.settings import Resource
1110-
print(f"DEBUG: treeplugin.py Tree _item_renamed ENTER message={message}")
1110+
# print(f"DEBUG: treeplugin.py Tree _item_renamed ENTER message={message}")
11111111
if not isinstance(message, RideItemNameChanged):
11121112
return
11131113
controller = message.item
1114-
print(f"DEBUG: treeplugin.py Tree _item_renamed DEFINED controller={controller}"
1115-
f" old_name={message.old_name} new_name={message.new_name}\n")
1114+
# print(f"DEBUG: treeplugin.py Tree _item_renamed DEFINED controller={controller}"
1115+
# f" old_name={message.old_name} new_name={message.new_name}\n")
11161116
node = (self.controller.find_node_by_controller(controller) or
11171117
self.controller.find_node_with_label(controller, message.old_name))
1118-
print(f"DEBUG: treeplugin.py Tree _item_renamed ENTER controller={controller}"
1119-
f" NODE={node}")
1118+
# print(f"DEBUG: treeplugin.py Tree _item_renamed ENTER controller={controller}"
1119+
# f" NODE={node}")
11201120
if hasattr(controller, 'datafile') and hasattr(controller.datafile, 'setting_table'):
11211121
imports = controller.datafile.setting_table.imports
1122-
print(f"DEBUG: treeplugin.py Tree _item_renamed HAS IMPORTS imports={imports}")
1122+
# print(f"DEBUG: treeplugin.py Tree _item_renamed HAS IMPORTS imports={imports}")
11231123
for imp in imports:
11241124
if isinstance(imp, Resource) and hasattr(message.item, 'keyword'):
1125-
print(f"DEBUG: treeplugin.py Tree _item_renamed IMPORT message.item.name={message.item.keyword},"
1126-
f" old_name={message.old_name} resource name={imp.name}")
1125+
# print(f"DEBUG: treeplugin.py Tree _item_renamed IMPORT message.item.name={message.item.keyword},"
1126+
# f" old_name={message.old_name} resource name={imp.name}")
11271127
# print(f"DEBUG: treeplugin.py Tree _item_renamed IMPORT message.item.name={message},"
11281128
# f" old_name={message.old_name} import={imp}")
11291129
self._rename_resource_kw(new_name=message.item.keyword, old_name=message.old_name, resource=imp)
1130-
if node and hasattr(message, 'old_name'):
1131-
print(f"DEBUG: treeplugin.py Tree _item_renamed RENAMED node={node}, old_name={message.old_name}\n"
1132-
f"new_name={message.new_name}")
1130+
# if node and hasattr(message, 'old_name'):
1131+
# print(f"DEBUG: treeplugin.py Tree _item_renamed RENAMED node={node}, old_name={message.old_name}\n"
1132+
# f"new_name={message.new_name}")
11331133
# Here we need to rename all resourc prefixed occurrencees
11341134

11351135
self.Refresh()
@@ -1138,8 +1138,8 @@ def _item_renamed(self, message):
11381138
self.SelectItem(node)
11391139
self.SetItemText(node, message.item.name)
11401140
new_name=self.GetItemText(node)
1141-
print(f"DEBUG: treeplugin.py Tree _item_renamed AFTER RENAMED new_name={new_name}"
1142-
f" controller={controller.datafile}")
1141+
# print(f"DEBUG: treeplugin.py Tree _item_renamed AFTER RENAMED new_name={new_name}"
1142+
# f" controller={controller.datafile}")
11431143
else:
11441144
return
11451145
if controller.dirty:
@@ -1154,44 +1154,44 @@ def _rename_resource_kw(self, new_name, old_name, resource):
11541154
return
11551155
keyword_name = old_name.split('.')[-1]
11561156
new_keyword_name = new_name.split('.')[-1]
1157-
print(f"DEBUG: treeplugin.py Tree _rename_resource_kw {prefix_res=} {keyword_name=}")
1157+
# print(f"DEBUG: treeplugin.py Tree _rename_resource_kw {prefix_res=} {keyword_name=}")
11581158
res_name=os.path.basename(resource.name)
1159-
print(f"DEBUG: treeplugin.py Tree _rename_resource_kw {res_name=}")
1159+
# print(f"DEBUG: treeplugin.py Tree _rename_resource_kw {res_name=}")
11601160
res_node=self.FindItem(self._resource_root, res_name)
11611161
if res_node:
11621162
self.EnsureVisible(res_node)
1163-
print(f"DEBUG: treeplugin.py Tree _rename_resource_kw root node {res_node=}")
1163+
# print(f"DEBUG: treeplugin.py Tree _rename_resource_kw root node {res_node=}")
11641164
# node = self.controller.find_node_with_label(res_node, keyword_name)
11651165
self._expand_and_render_children(res_node)
11661166
node = self.FindItem(res_node, keyword_name)
11671167
if node:
11681168
from ..controller.ctrlcommands import RenameKeywordOccurrences
11691169
from ..ui.progress import RenameProgressObserver
11701170
nlabel = node.GetText()
1171-
print(f"DEBUG: treeplugin.py Tree _rename_resource_kw node label {nlabel} {keyword_name}")
1171+
# print(f"DEBUG: treeplugin.py Tree _rename_resource_kw node label {nlabel} {keyword_name}")
11721172
if nlabel == keyword_name:
1173-
print(f"DEBUG: treeplugin.py Tree _rename_resource_kw {node=} {nlabel} change to {new_keyword_name=}")
1173+
# print(f"DEBUG: treeplugin.py Tree _rename_resource_kw {node=} {nlabel} change to {new_keyword_name=}")
11741174
self.EnsureVisible(node)
11751175
# self.SetItemText(node, new_keyword_name)
11761176
self.SelectItem(node)
11771177
controller = self.get_selected_datafile_controller()
11781178
keywords = controller.keywords
11791179
keyword_names = controller.get_keyword_names()
1180-
print(f"DEBUG: treeplugin.py Tree _rename_resource_kw already changed to {new_keyword_name=}"
1181-
f" controller={controller} keywords={keywords} \n"
1182-
f"{keyword_names=}")
1180+
# print(f"DEBUG: treeplugin.py Tree _rename_resource_kw already changed to {new_keyword_name=}"
1181+
# f" controller={controller} keywords={keywords} \n"
1182+
# f"{keyword_names=}")
11831183
for k in keywords.items:
1184-
print(f"DEBUG: treeplugin.py Tree _rename_resource_kw keywords: {k=}")
1184+
# print(f"DEBUG: treeplugin.py Tree _rename_resource_kw keywords: {k=}")
11851185
if k.name == keyword_name:
1186-
print(f"DEBUG: treeplugin.py Tree _rename_resource_kw CHANGING: {k.name=},"
1187-
f" {k.source=} ") # {k.details=}")
1186+
# print(f"DEBUG: treeplugin.py Tree _rename_resource_kw CHANGING: {k.name=},"
1187+
# f" {k.source=} ") # {k.details=}")
11881188
if controller.validate_keyword_name(new_keyword_name):
11891189
k.name = new_keyword_name
11901190
node.SetText(new_keyword_name)
11911191
RideUserKeywordRenamed(datafile=controller.datafile, item=k,
11921192
old_name=keyword_name).publish()
11931193
controller.mark_dirty()
1194-
print(f"DEBUG: treeplugin.py Tree _rename_resource_kw DONE CHANGING: {k.name=}")
1194+
# print(f"DEBUG: treeplugin.py Tree _rename_resource_kw DONE CHANGING: {k.name=}")
11951195
# self.controller.mark_node_dirty(self._get_datafile_node(controller.datafile))
11961196
self.observer = RenameProgressObserver(self.GetParent())
11971197
RenameKeywordOccurrences(keyword_name, new_keyword_name, self.observer)

utest/resources/robotdata/TestCases/Sub/resources/res02.resource

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
Library ./res.py
33

44
*** Keywords ***
5-
keyword11
5+
keyword1
66
[Arguments] ${a}
77
log ${a} This is at Sub/Resources/res02.resource
8-
Run Keyword keyword33
8+
Run Keyword keyword3
99

1010
keyword2
1111
[Arguments] ${a}
1212
log ${a}
1313

14-
keyword33
14+
keyword3
1515
res_kw

utest/resources/robotdata/TestCases/Sub/suite02.robot

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Resource ../../resources/external_res.resource
55

66
*** Test Cases ***
77
case01
8-
[Setup] res02.keyword11 Called from Setup in Sub/Suite02/case01
8+
[Setup] res02.keyword1 Called from Setup in Sub/Suite02/case01
99
my_kw
10-
res02.keyword33
10+
res02.keyword3
1111
external_res.keyword2 Called fromSteps on Sub/Suite02/case01
12-
[Teardown] external_res.keyword33
12+
[Teardown] external_res.keyword3

0 commit comments

Comments
 (0)