Fixed requirement of a deprecated field name to upload a thumbnail using the upload function. Added appropriate unit test.

Zaltu · Zaltu · commit 78383bfd5c8d · 2016-01-22T13:14:21.000-05:00
diff --git a/shotgun_api3/shotgun.py b/shotgun_api3/shotgun.py
@@ -1425,7 +1425,7 @@ def upload_thumbnail(self, entity_type, entity_id, path, **kwargs):
         :returns: Id of the new attachment
         """
         return self.upload(entity_type, entity_id, path,
-            field_name="thumb_image", **kwargs)
+            field_name="image", **kwargs)
 
     def upload_filmstrip_thumbnail(self, entity_type, entity_id, path, **kwargs):
         """Convenience function for uploading filmstrip thumbnails.
@@ -1443,7 +1443,7 @@ def upload_filmstrip_thumbnail(self, entity_type, entity_id, path, **kwargs):
                 "higher, server is %s" % (self.server_caps.version,))
 
         return self.upload(entity_type, entity_id, path,
-            field_name="filmstrip_thumb_image", **kwargs)
+            field_name="filmstrip_image", **kwargs)
 
     def upload(self, entity_type, entity_id, path, field_name=None,
         display_name=None, tag_list=None):
@@ -1470,7 +1470,8 @@ def upload(self, entity_type, entity_id, path, field_name=None,
         if not os.path.isfile(path):
             raise ShotgunError("Path must be a valid file, got '%s'" % path)
 
-        is_thumbnail = (field_name == "thumb_image" or field_name == "filmstrip_thumb_image")
+        is_thumbnail = (field_name == "thumb_image" or field_name == "filmstrip_thumb_image"
+                        or field_name == "image" or field_name == "filmstrip_image")
 
         params = {
             "entity_type" : entity_type,
diff --git a/tests/test_api.py b/tests/test_api.py
@@ -318,6 +318,17 @@ def test_upload_thumbnail_for_task(self):
             self.version['id'], {'image': None})
         expected_clear_thumbnail = {'id': self.version['id'], 'image': None, 'type': 'Version'}
         self.assertEqual(expected_clear_thumbnail, response_clear_thumbnail)
+        
+    def test_upload_thumbnail_with_upload_function(self):
+        """Upload thumbnail via upload function test"""
+        this_dir, _ = os.path.split(__file__)
+        path = os.path.abspath(os.path.expanduser(
+            os.path.join(this_dir,"sg_logo.jpg")))
+        size = os.stat(path).st_size
+
+        # upload thumbnail
+        thumb_id = self.sg.upload("Task", self.task['id'], path, 'image')
+        self.assertTrue(isinstance(thumb_id, int))
 
     def test_linked_thumbnail_url(self):
         this_dir, _ = os.path.split(__file__)
