Commandant

Merge lp:~jml/commandant/clean-up-flakes into lp:commandant

  1. clean-up-flakes
  2. Merge into trunk
Proposed by Jonathan Lange
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jml/commandant/clean-up-flakes
Merge into: lp:commandant
Diff against target: None lines
To merge this branch: bzr merge lp:~jml/commandant/clean-up-flakes
Reviewer Review Type Date Requested Status
Jamu Kakar Pending
Review via email: mp+7878@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) wrote :

Ugh, sorry about that Jamu -- I don't know what happened.

This branch should work.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'commandant/builtins.py'
--- commandant/builtins.py 2009-04-04 17:48:16 +0000
+++ commandant/builtins.py 2009-06-20 05:55:06 +0000
@@ -16,7 +16,6 @@
16# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.16# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1717
18from cStringIO import StringIO18from cStringIO import StringIO
19import os
2019
21from commandant import VERSION20from commandant import VERSION
22from commandant.commands import Command21from commandant.commands import Command
@@ -84,8 +83,6 @@
84 def get_text(self):83 def get_text(self):
85 stream = StringIO()84 stream = StringIO()
86 result = []85 result = []
87 help_topics = dict([(help_topic.name, help_topic) for help_topic
88 in self.commandant.get_help_topics()])
89 for command in self.commandant.get_commands():86 for command in self.commandant.get_commands():
90 help_topic = self.commandant.get_help_topic(command.name)87 help_topic = self.commandant.get_help_topic(command.name)
91 if not help_topic:88 if not help_topic:
9289
=== modified file 'commandant/controller.py'
--- commandant/controller.py 2009-04-04 02:01:40 +0000
+++ commandant/controller.py 2009-06-20 05:55:06 +0000
@@ -103,7 +103,7 @@
103 os.mkdir(module_path)103 os.mkdir(module_path)
104104
105 init_path = os.path.join(module_path, "__init__.py")105 init_path = os.path.join(module_path, "__init__.py")
106 init_file = open(init_path, "w").close()106 open(init_path, "w").close()
107107
108 source_code = open(file_path, "r").read()108 source_code = open(file_path, "r").read()
109 module_file_path = os.path.join(module_path, filename)109 module_file_path = os.path.join(module_path, filename)
110110
=== modified file 'commandant/tests/test_commands.py'
--- commandant/tests/test_commands.py 2009-04-04 01:44:45 +0000
+++ commandant/tests/test_commands.py 2009-06-20 05:55:06 +0000
@@ -19,7 +19,7 @@
1919
20from testresources import ResourcedTestCase20from testresources import ResourcedTestCase
2121
22from commandant.commands import Command, ExecutableCommand22from commandant.commands import ExecutableCommand
23from commandant.tests.mocker import MockerResource23from commandant.tests.mocker import MockerResource
24from commandant.tests.resources import (24from commandant.tests.resources import (
25 TemporaryDirectoryResource, CommandFactoryResource)25 TemporaryDirectoryResource, CommandFactoryResource)
2626
=== modified file 'commandant/tests/test_controller.py'
--- commandant/tests/test_controller.py 2009-04-04 02:01:40 +0000
+++ commandant/tests/test_controller.py 2009-06-20 05:55:06 +0000
@@ -231,7 +231,6 @@
231 ["test-command", "test-dash-command"])231 ["test-command", "test-dash-command"])
232232
233 def test_load_module_with_command(self):233 def test_load_module_with_command(self):
234 log = []
235 class FakeModule(object):234 class FakeModule(object):
236 __dict__ = {"cmd_test": Command, "ignored": int}235 __dict__ = {"cmd_test": Command, "ignored": int}
237 self.commandant.load_module(FakeModule())236 self.commandant.load_module(FakeModule())
@@ -240,7 +239,6 @@
240 ["test"])239 ["test"])
241240
242 def test_load_module_with_help_topic(self):241 def test_load_module_with_help_topic(self):
243 log = []
244 class FakeModule(object):242 class FakeModule(object):
245 __dict__ = {"topic_test": Command, "ignored": int}243 __dict__ = {"topic_test": Command, "ignored": int}
246 self.commandant.load_module(FakeModule())244 self.commandant.load_module(FakeModule())
@@ -248,7 +246,6 @@
248 in self.commandant.get_help_topics()], ["test"])246 in self.commandant.get_help_topics()], ["test"])
249247
250 def test_load_module_multiple_commands(self):248 def test_load_module_multiple_commands(self):
251 log = []
252 class FakeModule(object):249 class FakeModule(object):
253 __dict__ = {"cmd_test1": Command, "cmd_test2": Command}250 __dict__ = {"cmd_test1": Command, "cmd_test2": Command}
254 self.commandant.load_module(FakeModule())251 self.commandant.load_module(FakeModule())
@@ -257,7 +254,6 @@
257 ["test1", "test2"])254 ["test1", "test2"])
258255
259 def test_load_module_with_command_replaces_underscores_with_dashes(self):256 def test_load_module_with_command_replaces_underscores_with_dashes(self):
260 log = []
261 class FakeModule(object):257 class FakeModule(object):
262 __dict__ = {"cmd_test_command": Command, "ignored": int}258 __dict__ = {"cmd_test_command": Command, "ignored": int}
263 self.commandant.load_module(FakeModule())259 self.commandant.load_module(FakeModule())
@@ -266,7 +262,6 @@
266 ["test-command"])262 ["test-command"])
267263
268 def test_load_module_with_help_topic_replaces_underscores_with_dashes(self):264 def test_load_module_with_help_topic_replaces_underscores_with_dashes(self):
269 log = []
270 class FakeModule(object):265 class FakeModule(object):
271 __dict__ = {"topic_test_topic": Command, "ignored": int}266 __dict__ = {"topic_test_topic": Command, "ignored": int}
272 self.commandant.load_module(FakeModule())267 self.commandant.load_module(FakeModule())

Subscribers

People subscribed via source and target branches