Ticket #18451 modified to allow list values as arguments

kbehrman · kbehrman · commit b78282f30e57 · 2012-08-17T14:21:42.000-07:00
diff --git a/shotgun_api3/shotgun.py b/shotgun_api3/shotgun.py
@@ -1753,7 +1753,16 @@ def _translate_filters(filters, filter_operator):
         new_filters["logical_operator"] = "and"
     else:
         new_filters["logical_operator"] = "or"
-    conditions = [{"path":f[0], "relation":f[1], "values":f[2:]}
-                                                for f in filters]
+
+    conditions = []
+    for sg_filter in filters:
+        condition = {"path": sg_filter[0], "relation": sg_filter[1]}
+        values = sg_filter[2:]
+        if len(values) == 1 and isinstance(values[0], (list, tuple)):
+            values = values[0]
+
+        condition["values"] = values
+        conditions.append(condition)
+
     new_filters["conditions"] = conditions
     return new_filters
diff --git a/tests/test_api.py b/tests/test_api.py
@@ -119,6 +119,21 @@ def test_find(self):
         self.assertEqual("Version", version["type"])
         self.assertEqual(self.version['id'], version["id"])
 
+    def test_find_in(self):
+        """Test use of 'in' relation with find."""
+        # id
+        filters = [['id', 'in', [self.project['id'], 99999]]]
+        projects = self.sg.find('Project', filters)
+        self.assertTrue(any(r['id'] == self.project['id'] for r in projects))
+
+        # text field
+        filters = [['name', 'in', [self.project['name'], 'fake project name']]]
+        projects = self.sg.find('Project', filters)
+        project = projects[0]
+        self.assertEqual(self.project['id'], project['id'])
+
+
+
     def test_last_accessed(self):
         page = self.sg.find('Page', [], fields=['last_accessed'], limit=1)
         self.assertEqual("Page", page[0]['type'])
