Fix import errors & token format issue.

token should not use - OR any other character as per regex in url.

control/celeryapp.py

@@ -8,7 +8,10 @@ import os
 from celery import Celery
 import yaml
 
-from control.veda_deliver import VedaDelivery
+try:
+    from control.veda_deliver import VedaDelivery
+except ImportError:
+    from veda_deliver import VedaDelivery
 
 
 auth_yaml = os.path.join(

control/veda_deliver.py

@@ -13,7 +13,6 @@ from boto.s3.key import Key
 from django.core.urlresolvers import reverse
 
 import veda_deliver_xuetang
-from control.veda_deliver_3play import ThreePlayMediaClient
 from control_env import *
 from veda_deliver_cielo import Cielo24Transcript
 from veda_deliver_youtube import DeliverYoutube
@@ -26,6 +25,12 @@ from veda_val import VALAPICall
 from veda_video_validation import Validation
 from watchdog import Watchdog
 
+try:
+    from control.veda_deliver_3play import ThreePlayMediaClient
+except ImportError:
+    from veda_deliver_3play import ThreePlayMediaClient
+
+
 LOGGER = logging.getLogger(__name__)
 
 

instance_config.yaml

@@ -63,7 +63,7 @@ three_play_api_base_url: https://api.3playmedia.com/
 three_play_api_transcript_url: https://static.3playmedia.com/
 
 # a token identifying a valid request from transcript provider
-transcript_provider_request_token: test-token
+transcript_provider_request_token: testtoken
 
 # Ingest Secret
 # TODO: Elminate access key after AWS Support ticket 08/20/17 regarding cross-account IAM role access.