Merge pull request shotgunsoftware#12 from dahiro/master

mattdaw · mattdaw · commit 68ba3527930f · 2012-07-31T09:39:23.000-07:00
return_fields of create-call might be None
diff --git a/shotgun_api3/shotgun.py b/shotgun_api3/shotgun.py
@@ -538,6 +538,9 @@ def create(self, entity_type, data, return_fields=None):
 
         data = copy.deepcopy(data)
 
+        if not return_fields:
+            return_fields = ["id"]
+
         upload_image = None
         if 'image' in data:
             upload_image = data.pop('image')
@@ -549,7 +552,7 @@ def create(self, entity_type, data, return_fields=None):
                     "higher, server is %s" % (self.server_caps.version,))
             upload_filmstrip_image = data.pop('filmstrip_image')
 
-        temp_return_fields = [item for item in return_fields]
+        temp_return_fields = copy.deepcopy(return_fields)
         if upload_image and "image" in temp_return_fields:
             temp_return_fields.remove("image")
         # end if
@@ -561,7 +564,7 @@ def create(self, entity_type, data, return_fields=None):
         params = {
             "type" : entity_type,
             "fields" : self._dict_to_list(data),
-            "return_fields" : temp_return_fields or ["id"]
+            "return_fields" : temp_return_fields
         }
 
         record = self._call_rpc("create", params, first=True)
