Merge branch '1228' into v0.6

This commit is contained in:
Peter Šurda 2018-05-10 08:44:46 +02:00
commit 7445665963
Signed by untrusted user: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87
1 changed files with 2 additions and 2 deletions

View File

@ -559,7 +559,7 @@ def genAdd(lbl,deterministic, passphrase, numOfAdd, addVNum, streamNum, ripe): #
return 'Entry Error'
def delMilAddr(): #Generate address
def delMilAddr(): #Delete address
global usrPrompt
response = api.listAddresses2()
@ -1376,7 +1376,7 @@ def UI(usrInput): #Main user menu
elif usrInput == "generateaddress": #Generates a new address
uInput = userInput('\nWould you like to create a (D)eterministic or (R)andom address?').lower()
if uInput == "d" or uInput == "determinstic": #Creates a deterministic address
if uInput in ["d", "deterministic"]: #Creates a deterministic address
deterministic = True
#lbl = raw_input('Label the new address:') #currently not possible via the api