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
1=== modified file 'commandant/builtins.py'
2--- commandant/builtins.py 2009-04-04 17:48:16 +0000
3+++ commandant/builtins.py 2009-06-20 05:55:06 +0000
4@@ -16,7 +16,6 @@
5 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
6
7 from cStringIO import StringIO
8-import os
9
10 from commandant import VERSION
11 from commandant.commands import Command
12@@ -84,8 +83,6 @@
13 def get_text(self):
14 stream = StringIO()
15 result = []
16- help_topics = dict([(help_topic.name, help_topic) for help_topic
17- in self.commandant.get_help_topics()])
18 for command in self.commandant.get_commands():
19 help_topic = self.commandant.get_help_topic(command.name)
20 if not help_topic:
21
22=== modified file 'commandant/controller.py'
23--- commandant/controller.py 2009-04-04 02:01:40 +0000
24+++ commandant/controller.py 2009-06-20 05:55:06 +0000
25@@ -103,7 +103,7 @@
26 os.mkdir(module_path)
27
28 init_path = os.path.join(module_path, "__init__.py")
29- init_file = open(init_path, "w").close()
30+ open(init_path, "w").close()
31
32 source_code = open(file_path, "r").read()
33 module_file_path = os.path.join(module_path, filename)
34
35=== modified file 'commandant/tests/test_commands.py'
36--- commandant/tests/test_commands.py 2009-04-04 01:44:45 +0000
37+++ commandant/tests/test_commands.py 2009-06-20 05:55:06 +0000
38@@ -19,7 +19,7 @@
39
40 from testresources import ResourcedTestCase
41
42-from commandant.commands import Command, ExecutableCommand
43+from commandant.commands import ExecutableCommand
44 from commandant.tests.mocker import MockerResource
45 from commandant.tests.resources import (
46 TemporaryDirectoryResource, CommandFactoryResource)
47
48=== modified file 'commandant/tests/test_controller.py'
49--- commandant/tests/test_controller.py 2009-04-04 02:01:40 +0000
50+++ commandant/tests/test_controller.py 2009-06-20 05:55:06 +0000
51@@ -231,7 +231,6 @@
52 ["test-command", "test-dash-command"])
53
54 def test_load_module_with_command(self):
55- log = []
56 class FakeModule(object):
57 __dict__ = {"cmd_test": Command, "ignored": int}
58 self.commandant.load_module(FakeModule())
59@@ -240,7 +239,6 @@
60 ["test"])
61
62 def test_load_module_with_help_topic(self):
63- log = []
64 class FakeModule(object):
65 __dict__ = {"topic_test": Command, "ignored": int}
66 self.commandant.load_module(FakeModule())
67@@ -248,7 +246,6 @@
68 in self.commandant.get_help_topics()], ["test"])
69
70 def test_load_module_multiple_commands(self):
71- log = []
72 class FakeModule(object):
73 __dict__ = {"cmd_test1": Command, "cmd_test2": Command}
74 self.commandant.load_module(FakeModule())
75@@ -257,7 +254,6 @@
76 ["test1", "test2"])
77
78 def test_load_module_with_command_replaces_underscores_with_dashes(self):
79- log = []
80 class FakeModule(object):
81 __dict__ = {"cmd_test_command": Command, "ignored": int}
82 self.commandant.load_module(FakeModule())
83@@ -266,7 +262,6 @@
84 ["test-command"])
85
86 def test_load_module_with_help_topic_replaces_underscores_with_dashes(self):
87- log = []
88 class FakeModule(object):
89 __dict__ = {"topic_test_topic": Command, "ignored": int}
90 self.commandant.load_module(FakeModule())

Subscribers

People subscribed via source and target branches