AaronFiore/electrum
1
0
Fork 0
Code Activity

make proxy an optional parameter

Browse Source
This commit is contained in:
thomasv
2012-10-01 18:14:50 +02:00
parent 44dd7713e5
commit f3ff9b5cf6
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
electrum
View File

@@ -116,11 +116,11 @@ if __name__ == '__main__':
parser.add_option("-s", "--fromaddr", dest="from_addr", default=None, help="set source address for payto/mktx. if it isn't in the wallet, it will ask for the private key unless supplied in the format public_key:private_key. It's not saved in the wallet.")
parser.add_option("-c", "--changeaddr", dest="change_addr", default=None, help="set the change address for payto/mktx. default is a spare address, or the source address if it's not in the wallet")
parser.add_option("-r", "--remote", dest="remote_url", default=None, help="URL of a remote wallet")
parser.add_option("-p", "--proxy", dest="proxy", default=simple_config.config["proxy"], help="set proxy [type:]host[:port], where type is socks4,socks5 or http")
parser.add_option("-p", "--proxy", dest="proxy", default=None, help="set proxy [type:]host[:port], where type is socks4,socks5 or http")
options, args = parser.parse_args()
if type(options.proxy) == type(''):
options.proxy = parse_proxy_options(options.proxy)
if options.proxy:
options.proxy = parse_proxy_options(options.proxy)
wallet = Wallet()
wallet.set_path(options.wallet_path)