Revision 2a0d6ae0
| b/pithos/lib/util.py | ||
|---|---|---|
| 35 | 35 |
|
| 36 | 36 |
DEFAULT_URL = 'https://plus.pithos.grnet.gr/v1' |
| 37 | 37 |
DEFAULT_USER = 'test' |
| 38 |
DEFAULT_AUTH = '0000'
|
|
| 38 |
DEFAULT_TOKEN = '0000'
|
|
| 39 | 39 |
|
| 40 | 40 |
def get_user(): |
| 41 | 41 |
try: |
| ... | ... | |
| 45 | 45 |
|
| 46 | 46 |
def get_auth(): |
| 47 | 47 |
try: |
| 48 |
return os.environ['PITHOS_AUTH']
|
|
| 48 |
return os.environ['PITHOS_TOKEN']
|
|
| 49 | 49 |
except KeyError: |
| 50 |
return DEFAULT_AUTH
|
|
| 50 |
return DEFAULT_TOKEN
|
|
| 51 | 51 |
|
| 52 | 52 |
def get_url(): |
| 53 | 53 |
try: |
| b/pithos/tools/pithos-sh | ||
|---|---|---|
| 69 | 69 |
def __init__(self, name, argv): |
| 70 | 70 |
parser = OptionParser('%%prog %s [options] %s' % (name, self.syntax))
|
| 71 | 71 |
parser.add_option('--url', dest='url', metavar='HOST',
|
| 72 |
default=get_url(), help='use server URL')
|
|
| 73 |
parser.add_option('--user', dest='user', metavar='USERNAME',
|
|
| 72 |
default=get_url(), help='server URL (currently: %s)' % get_url())
|
|
| 73 |
parser.add_option('--user', dest='user', metavar='USER',
|
|
| 74 | 74 |
default=get_user(), |
| 75 |
help='use account USERNAME')
|
|
| 76 |
parser.add_option('--token', dest='token', metavar='AUTH',
|
|
| 75 |
help='account USER (currently: %s)' % get_user())
|
|
| 76 |
parser.add_option('--token', dest='token', metavar='TOKEN',
|
|
| 77 | 77 |
default=get_auth(), |
| 78 |
help='use account AUTH')
|
|
| 78 |
help='account TOKEN (currently: %s)' % get_auth())
|
|
| 79 | 79 |
parser.add_option('-v', action='store_true', dest='verbose',
|
| 80 |
default=False, help='use verbose output')
|
|
| 80 |
default=False, help='verbose output') |
|
| 81 | 81 |
parser.add_option('-d', action='store_true', dest='debug',
|
| 82 |
default=False, help='use debug output')
|
|
| 82 |
default=False, help='debug output') |
|
| 83 | 83 |
self.add_options(parser) |
| 84 | 84 |
options, args = parser.parse_args(argv) |
| 85 | 85 |
|
Also available in: Unified diff