Modify the package import path to enhance the compatibility.

ericsk · ericsk · commit e58abd6470af · 2018-05-29T10:55:16.000+08:00
diff --git a/samples/language/spellcheck_samples.py b/samples/language/spellcheck_samples.py
@@ -38,6 +38,6 @@ def spellcheck(subscription_key):
 
 if __name__ == "__main__":
     import sys, os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))    
-    from tools import execute_samples
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))    
+    from samples.tools import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/language/text_analytics_samples.py b/samples/language/text_analytics_samples.py
@@ -122,6 +122,6 @@ def sentiment(subscription_key):
 
 if __name__ == "__main__":
     import sys, os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))    
-    from tools import execute_samples
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))    
+    from samples.tools import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/search/custom_search_samples.py b/samples/search/custom_search_samples.py
@@ -27,6 +27,6 @@ def custom_search_web_page_result_lookup(subscription_key):
 
 if __name__ == "__main__":
     import sys, os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))    
-    from tools import execute_samples
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))    
+    from samples.tools import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/search/entity_search_samples.py b/samples/search/entity_search_samples.py
@@ -183,6 +183,6 @@ def error(subscription_key):
 
 if __name__ == "__main__":
     import sys, os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))    
-    from tools import execute_samples
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))    
+    from samples.tools import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/search/image_search_samples.py b/samples/search/image_search_samples.py
@@ -196,6 +196,6 @@ def image_detail(subscription_key):
 
 if __name__ == "__main__":
     import sys, os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))    
-    from tools import execute_samples
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))    
+    from samples.tools import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/search/news_search_samples.py b/samples/search/news_search_samples.py
@@ -120,6 +120,6 @@ def news_trending(subscription_key):
 
 if __name__ == "__main__":
     import sys, os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))    
-    from tools import execute_samples
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))    
+    from samples.tools import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/search/video_search_samples.py b/samples/search/video_search_samples.py
@@ -145,6 +145,6 @@ def video_detail(subscription_key):
 
 if __name__ == "__main__":
     import sys, os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))    
-    from tools import execute_samples
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))    
+    from samples.tools import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/search/visual_search_samples.py b/samples/search/visual_search_samples.py
@@ -197,6 +197,6 @@ def search_insights_token_with_crop_area(subscription_key):
 
 if __name__ == "__main__":
     import sys, os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+    from samples.tools import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/search/web_search_samples.py b/samples/search/web_search_samples.py
@@ -157,6 +157,6 @@ def web_search_with_answer_count_promote_and_safe_search(subscription_key):
 
 if __name__ == "__main__":
     import sys, os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+    from samples.tools import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/vision/computer_vision_samples.py b/samples/vision/computer_vision_samples.py
@@ -40,6 +40,6 @@ def image_analysis_in_stream(subscription_key):
 
 if __name__ == "__main__":
     import sys, os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+    from samples.tools import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/vision/content_moderator_image_job_samples.py b/samples/vision/content_moderator_image_job_samples.py
@@ -86,6 +86,6 @@ def image_review_jobs(subscription_key):
 
 if __name__ == "__main__":
     import sys, os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+    from samples.tools import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/vision/content_moderator_image_list_samples.py b/samples/vision/content_moderator_image_list_samples.py
@@ -214,6 +214,6 @@ def add_images(list_id, image_url, label):
 
 if __name__ == "__main__":
     import sys, os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+    from samples.tools import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/vision/content_moderator_image_moderation_samples.py b/samples/vision/content_moderator_image_moderation_samples.py
@@ -66,6 +66,6 @@ def image_moderation(subscription_key):
 
 if __name__ == "__main__":
     import sys, os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+    from samples.tools import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/vision/content_moderator_image_review.py b/samples/vision/content_moderator_image_review.py
@@ -80,6 +80,6 @@ def image_review(subscription_key):
 
 if __name__ == "__main__":
     import sys, os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+    from samples.tools import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/vision/content_moderator_term_list_samples.py b/samples/vision/content_moderator_term_list_samples.py
@@ -162,6 +162,6 @@ def terms_lists(subscription_key):
 
 if __name__ == "__main__":
     import sys, os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+    from samples.tools import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/vision/content_moderator_text_moderation_samples.py b/samples/vision/content_moderator_text_moderation_samples.py
@@ -46,6 +46,6 @@ def text_moderation(subscription_key):
 
 if __name__ == "__main__":
     import sys, os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+    from samples.tools import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/vision/content_moderator_video_review.py b/samples/vision/content_moderator_video_review.py
@@ -112,6 +112,6 @@ def create_frames_to_add_to_reviews(timestamp_seconds, url):
 
 if __name__ == "__main__":
     import sys, os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+    from samples.tools import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/vision/content_moderator_video_transcript_review.py b/samples/vision/content_moderator_video_transcript_review.py
@@ -107,6 +107,6 @@ def video_transcript_review(subscription_key):
 
 if __name__ == "__main__":
     import sys, os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+    from samples.tools import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/vision/custom_vision_object_detection_sample.py b/samples/vision/custom_vision_object_detection_sample.py
@@ -2,6 +2,8 @@
 import sys
 import time
 
+sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+
 from azure.cognitiveservices.vision.customvision.training import training_api
 from azure.cognitiveservices.vision.customvision.training.models import ImageFileCreateEntry, Region
 from azure.cognitiveservices.vision.customvision.prediction import prediction_endpoint
@@ -20,6 +22,7 @@ def run_sample(subscription_key):
     try:
         prediction_key = os.environ[PREDICTION_KEY_ENV_NAME]
     except KeyError:
+        from samples.tools import SubscriptionKeyError
         raise SubscriptionKeyError("You need to set the {} env variable.".format(PREDICTION_KEY_ENV_NAME))
 
     project, iteration = train_project(subscription_key)
@@ -131,7 +134,5 @@ def predict_project(prediction_key, project, iteration):
 
 
 if __name__ == "__main__":
-    import sys, os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
+    from samples.tools import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/vision/custom_vision_prediction_samples.py b/samples/vision/custom_vision_prediction_samples.py
@@ -46,6 +46,6 @@ def predict_project(subscription_key):
 
 if __name__ == "__main__":
     import sys, os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples, SubscriptionKeyError
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+    from samples.tools import execute_samples, SubscriptionKeyError
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/vision/custom_vision_training_samples.py b/samples/vision/custom_vision_training_samples.py
@@ -45,6 +45,6 @@ def train_project(subscription_key):
 
 if __name__ == "__main__":
     import sys, os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+    from samples.tools import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
