Compare commits

..

No commits in common. 'a3386131a75ca634ea22e0c51c33d0fdcb3fbe7b' and 'ab7b2c060c6ce70b186c5c68f621dc0bf115290d' have entirely different histories.

  1. 2
      pbincli/__init__.py
  2. 6
      pbincli/cli.py

2
pbincli/__init__.py

@ -2,6 +2,6 @@ @@ -2,6 +2,6 @@
# -*- coding: utf-8 -*-
__author__ = "R4SAS <r4sas@i2pmail.org>"
__version__ = "0.3.5"
__version__ = "0.3.4"
__copyright__ = "Copyright (c) R4SAS"
__license__ = "MIT"

6
pbincli/cli.py

@ -37,8 +37,6 @@ def read_config(filename): @@ -37,8 +37,6 @@ def read_config(filename):
def main():
parser = argparse.ArgumentParser(description='Full-featured PrivateBin command-line client')
parser.add_argument("-d", "--debug", default=False, action="store_true", help="Enable debug output")
subparsers = parser.add_subparsers(title="actions", help="List of commands")
# a send command
@ -138,7 +136,7 @@ def main(): @@ -138,7 +136,7 @@ def main():
for p in CONFIG_PATHS:
if os.path.exists(p):
fileconfig = read_config(p)
if args.debug: print("Configuration readed from file:\n{}".format(fileconfig))
if args.debug: print("Configuration readed from file:\t{}".format(fileconfig))
CONFIG.update(fileconfig)
break
@ -153,7 +151,7 @@ def main(): @@ -153,7 +151,7 @@ def main():
# Re-validate PrivateBin instance URL
CONFIG['server'] = validate_url_ending(CONFIG['server'])
if args.debug: print("Whole configuration:\n{}\n".format(CONFIG))
if args.debug: print("Whole configuration:\t\t{}".format(CONFIG))
api_client = PrivateBin(CONFIG)
if hasattr(args, "func"):

Loading…
Cancel
Save