For #27860, added server version checks.

manneohrstrom · manneohrstrom · commit c7a3ae797f5d · 2015-03-24T18:17:45.000Z
diff --git a/shotgun_api3/shotgun.py b/shotgun_api3/shotgun.py
@@ -1006,7 +1006,11 @@ def schema_entity_read(self, project_entity=None):
         params = {}
 
         if project_entity:
-            params["project"] = project_entity
+            if not self.server_caps.version or self.server_caps.version < (5, 4, 4):
+                raise ShotgunError("Per project schema operations require server "\
+                                   "version 5.4.4 or higher, server is %s" % (self.server_caps.version,))
+            else:
+                params["project"] = project_entity
 
         if params:
             return self._call_rpc("schema_entity_read", params)
@@ -1026,8 +1030,12 @@ def schema_read(self, project_entity=None):
         params = {}
 
         if project_entity:
-            params["project"] = project_entity
-
+            if not self.server_caps.version or self.server_caps.version < (5, 4, 4):
+                raise ShotgunError("Per project schema operations require server "\
+                                   "version 5.4.4 or higher, server is %s" % (self.server_caps.version,))
+            else:
+                params["project"] = project_entity
+            
         if params:
             return self._call_rpc("schema_read", params)
         else:
@@ -1056,8 +1064,13 @@ def schema_field_read(self, entity_type, field_name=None, project_entity=None):
         }
         if field_name:
             params["field_name"] = field_name
-        if project_entity:
-            params["project"] = project_entity
+            
+        if project_entity:            
+            if not self.server_caps.version or self.server_caps.version < (5, 4, 4):
+                raise ShotgunError("Per project schema operations require server "\
+                                   "version 5.4.4 or higher, server is %s" % (self.server_caps.version,))
+            else:
+                params["project"] = project_entity
 
         return self._call_rpc("schema_field_read", params)
 
diff --git a/tests/test_api_long.py b/tests/test_api_long.py
@@ -100,30 +100,38 @@ def test_schema(self):
     def test_schema_with_project(self):
         """Called schema functions"""
 
-        project_entity = {'type': 'Project', 'id': 0}
-        schema = self.sg.schema_entity_read(project_entity)
-        self.assertTrue(schema, dict)
-        self.assertTrue(len(schema) > 0)
-        self.assertTrue('Project' in schema)
-        self.assertTrue('visible' in schema['Project'])
-
-        schema = self.sg.schema_read(project_entity)
-        self.assertTrue(schema, dict)
-        self.assertTrue(len(schema) > 0)
-        self.assertTrue('Version' in schema)
-        self.assertFalse('visible' in schema.keys())
-
-        schema = self.sg.schema_field_read('Version', project_entity=project_entity)
-        self.assertTrue(schema, dict)
-        self.assertTrue(len(schema) > 0)
-        self.assertTrue('user' in schema)
-        self.assertTrue('visible' in schema['user'])
-
-        schema = self.sg.schema_field_read('Version', 'user', project_entity)
-        self.assertTrue(schema, dict)
-        self.assertTrue(len(schema) > 0)
-        self.assertTrue('user' in schema)
-        self.assertTrue('visible' in schema['user'])
+        if not self.sg.server_caps.version or self.sg.server_caps.version < (5, 4, 4):
+            # server does not support this!
+            self.assertRaises(shotgun_api3.ShotgunError, self.sg.schema_entity_read, {'type': 'Project', 'id': 0})
+            self.assertRaises(shotgun_api3.ShotgunError, self.sg.schema_read, {'type': 'Project', 'id': 0})
+            self.assertRaises(shotgun_api3.ShotgunError, self.sg.schema_field_read, 'Version', None, {'type': 'Project', 'id': 0})
+            self.assertRaises(shotgun_api3.ShotgunError, self.sg.schema_field_read, 'Version', 'user', {'type': 'Project', 'id': 0})
+            
+        else:
+            project_entity = {'type': 'Project', 'id': 0}
+            schema = self.sg.schema_entity_read(project_entity)
+            self.assertTrue(schema, dict)
+            self.assertTrue(len(schema) > 0)
+            self.assertTrue('Project' in schema)
+            self.assertTrue('visible' in schema['Project'])
+    
+            schema = self.sg.schema_read(project_entity)
+            self.assertTrue(schema, dict)
+            self.assertTrue(len(schema) > 0)
+            self.assertTrue('Version' in schema)
+            self.assertFalse('visible' in schema.keys())
+    
+            schema = self.sg.schema_field_read('Version', project_entity=project_entity)
+            self.assertTrue(schema, dict)
+            self.assertTrue(len(schema) > 0)
+            self.assertTrue('user' in schema)
+            self.assertTrue('visible' in schema['user'])
+    
+            schema = self.sg.schema_field_read('Version', 'user', project_entity)
+            self.assertTrue(schema, dict)
+            self.assertTrue(len(schema) > 0)
+            self.assertTrue('user' in schema)
+            self.assertTrue('visible' in schema['user'])
 
 
 if __name__ == '__main__':
