Merge pull request #6 from ReelDx/staging

production ready
ReelDx · Feb 18, 2016 · d90bde1 · d90bde1
2 parents bbbe72e + c60e043
commit d90bde1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bin/api_tools_user.py b/bin/api_tools_user.py
@@ -96,7 +96,7 @@ def user_list(account_jwt):
 	if user_data:
 		for user_obj in user_data:
 			tmp_app_id = user_obj.get('app_id')
-			if(int(tmp_app_id) == int(keys.app_id)):
+			if(tmp_app_id == keys.app_id):
 				app_user_id = str(user_obj.get('app_user_id'))
 				app_info, app_user_id = app_user_id.split('|',1)
 				temp_id = str(user_obj.get('id'))

diff --git a/bin/render_tools.py b/bin/render_tools.py
@@ -203,7 +203,7 @@ def render_video_play(smil_data):
 	#	output: HTML formatted Response (str)
 	#
 
-	output_data = None
+	output_data = ""
 
 	# JW Player Enterprise
 	if keys.jw_path and keys.jw_key: