summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-07-21 19:55:25 +0200
committerKali Kaneko <kali@leap.se>2016-07-21 19:55:31 +0200
commitc8520be5c0a6c1c0e804f752d71baaf47367a0b8 (patch)
tree959962e1c4e13ae1e46b5f6c11d9df65483f9a87 /src/leap
parent2a39fcaf8cf6d20c2cfac46ddba661ddc9699f39 (diff)
[refactor] minor refactoring for consistency
Diffstat (limited to 'src/leap')
-rwxr-xr-xsrc/leap/bitmask/cli/bitmask_cli.py6
-rw-r--r--src/leap/bitmask/cli/eip.py6
-rw-r--r--src/leap/bitmask/cli/keys.py6
-rw-r--r--src/leap/bitmask/cli/mail.py8
4 files changed, 13 insertions, 13 deletions
diff --git a/src/leap/bitmask/cli/bitmask_cli.py b/src/leap/bitmask/cli/bitmask_cli.py
index 0aafeb78..1f104c9c 100755
--- a/src/leap/bitmask/cli/bitmask_cli.py
+++ b/src/leap/bitmask/cli/bitmask_cli.py
@@ -27,11 +27,11 @@ from twisted.internet import reactor, defer
from leap.bitmask.cli.eip import Eip
from leap.bitmask.cli.keys import Keys
from leap.bitmask.cli.mail import Mail
-from leap.bitmask.cli.command import Command
+from leap.bitmask.cli import command
from leap.bitmask.cli.user import User
-class BitmaskCLI(Command):
+class BitmaskCLI(command.Command):
usage = '''bitmaskctl <command> [<args>]
Controls the Bitmask application.
@@ -83,7 +83,7 @@ GENERAL COMMANDS:
return defer.succeed(None)
def version(self, raw_args):
- print(Fore.GREEN + 'bitmask_cli: ' + Fore.RESET + '0.0.1')
+ print(Fore.GREEN + 'bitmaskctl: ' + Fore.RESET + '0.0.1')
self.data = ['version']
return self._send(printer=self._print_version)
diff --git a/src/leap/bitmask/cli/eip.py b/src/leap/bitmask/cli/eip.py
index 2ce43d81..eac8682a 100644
--- a/src/leap/bitmask/cli/eip.py
+++ b/src/leap/bitmask/cli/eip.py
@@ -17,10 +17,10 @@
"""
Bitmask Command Line interface: eip
"""
-from leap.bitmask.cli.command import appname, Command
+from leap.bitmask.cli import command
-class Eip(Command):
+class Eip(command.Command):
service = 'eip'
usage = '''{name} eip <subcommand>
@@ -32,6 +32,6 @@ SUBCOMMANDS:
stop Stop service
status Display status about service
-'''.format(name=appname)
+'''.format(name=command.appname)
commands = ['start', 'stop', 'status']
diff --git a/src/leap/bitmask/cli/keys.py b/src/leap/bitmask/cli/keys.py
index 829dd46f..d74c40a8 100644
--- a/src/leap/bitmask/cli/keys.py
+++ b/src/leap/bitmask/cli/keys.py
@@ -22,11 +22,11 @@ import sys
from colorama import Fore
-from leap.bitmask.cli.command import appname, Command
+from leap.bitmask.cli import command
from leap.keymanager.validation import ValidationLevels
-class Keys(Command):
+class Keys(command.Command):
service = 'keys'
usage = '''{name} keys <subcommand>
@@ -38,7 +38,7 @@ SUBCOMMANDS:
export Export a given key
insert Insert a key to the key storage
delete Delete a key from the key storage
-'''.format(name=appname)
+'''.format(name=command.appname)
def list(self, raw_args):
parser = argparse.ArgumentParser(
diff --git a/src/leap/bitmask/cli/mail.py b/src/leap/bitmask/cli/mail.py
index 76fdc3b9..9bb5581d 100644
--- a/src/leap/bitmask/cli/mail.py
+++ b/src/leap/bitmask/cli/mail.py
@@ -17,14 +17,14 @@
"""
Bitmask Command Line interface: mail
"""
-from leap.bitmask.cli.command import appname, Command
+from leap.bitmask.cli import command
-class Mail(Command):
+class Mail(command.Command):
service = 'mail'
usage = '''{name} mail <subcommand>
-Bitmask Encrypted Email service
+Bitmask Encrypted Email Service
SUBCOMMANDS:
@@ -34,7 +34,7 @@ SUBCOMMANDS:
get-token Returns token for the mail service
get-smtp-certificate Downloads a new smtp certificate
-'''.format(name=appname)
+'''.format(name=command.appname)
commands = ['enable', 'disable', 'status', 'get-token',
'get-smtp-certificate']