From 713f4094622e3fbae6816ad33066d12349a2e5ba Mon Sep 17 00:00:00 2001
From: srz-zumix <zumix.cpp@gmail.com>
Date: Thu, 16 Apr 2015 08:22:52 +0900
Subject: [PATCH] update r817

---
 tools/twilio/iutwilio.py | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/tools/twilio/iutwilio.py b/tools/twilio/iutwilio.py
index 534990ca4c..f34c40260b 100644
--- a/tools/twilio/iutwilio.py
+++ b/tools/twilio/iutwilio.py
@@ -37,6 +37,18 @@ def parse_command_line():
 		'--call'
 		, help = 'call to number.'
 	)
+	parser.add_argument(
+		'--account_sid'
+		, help = 'account sid.'
+	)
+	parser.add_argument(
+		'--auth_token'
+		, help = 'auth token.'
+	)
+	parser.add_argument(
+		'--number'
+		, help = 'twilio phone number.'
+	)
 	parser.add_argument(
 		'--dump'
 		, action = 'store_true'
@@ -68,6 +80,19 @@ def parse_command_line():
 	
 	return options
 
+#
+# setup
+def setup(options):
+	global account_sid
+	global auth_token
+	global my_number
+	if options.account_sid:
+		account_sid = options.account_sid
+	if options.auth_token:
+		auth_token = options.auth_token
+	if options.number:
+		my_number = options.number
+
 #
 # parse ini
 def parse_ini(path):
@@ -80,9 +105,13 @@ def parse_ini(path):
 	global account_sid
 	global auth_token
 	global my_number
-	account_sid = ini.get('Twilio', 'account_sid')
-	auth_token = ini.get('Twilio', 'auth_token')
-	my_number = ini.get('Twilio', 'my_number')
+	try:
+		account_sid = ini.get('Twilio', 'account_sid')
+		auth_token = ini.get('Twilio', 'auth_token')
+		my_number = ini.get('Twilio', 'my_number')
+	except:
+		pass
+		
 #	for section in ini.sections():
 #		print '[%s]' % (section)
 #		for key in ini.options(section):
@@ -145,6 +174,7 @@ def dump():
 def main():
 	options = parse_command_line()
 	parse_ini(options.ini)
+	setup(options)
 	if options.dump:
 		dump()
 	else: