Skip to content

Commit

Permalink
some last fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
KenjiTakahashi committed Jul 19, 2013
1 parent 01ccad6 commit 6059231
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
12 changes: 5 additions & 7 deletions td/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,6 @@ def _part(self, name, func, args, help, **kwargs):
:kwargs: Additional arguments for :func:.
"""
if not self.argv and args:
raise NotEnoughArgumentsError(name)
while self.argv:
arg = self.argv.popleft()
if arg == "-h" or arg == "--help":
Expand Down Expand Up @@ -238,10 +236,10 @@ def rock(self):
**args
)
elif arg == "e" or arg == "edit":
args = dict()
if not self.argv:
raise NotEnoughArgumentsError("edit")
elif self.argv[0] not in ["-h", "--help"]:
args = dict()
if self.argv[0] not in ["-h", "--help"]:
args["index"] = self.argv.popleft()
self._part("edit", self.arg.edit, {
"--parent": ("parent", True),
Expand Down Expand Up @@ -341,9 +339,9 @@ class Get(object):

TYPES = {
"name": "any text (required)",
"comment": "any text (default: <empty>)",
"priority": "number or name (default: 3 or 'normal')",
"parent": "valid index (default: <top level>)"
"comment": "any text (<empty>)",
"priority": "no/name (3/normal)",
"parent": "index (<top level>)"
}
PRIORITIES = {
"lowest": "1",
Expand Down
5 changes: 0 additions & 5 deletions tests/test_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,6 @@ def test_no_arguments(self):
parser._part("test", self.func1, {}, "", test=True)
assert self.out1 is True

def test_not_enough_arguments(self):
parser = Parser("", ["td"])
parser._part("test", "", {"-t": ("test", True)}, "")
self.handler.assertLogged("test: Not enough arguments.")

def test_missing_argument(self):
parser = Parser("", ["td", "-t"])
parser._part("test", "", {"-t": ("test", True)}, "")
Expand Down

0 comments on commit 6059231

Please sign in to comment.