recreate _IRODS_VERSION as function returning server compatibility tuple

Author: d-w-moore

irods/helpers/__init__.py

@@ -59,7 +59,7 @@ def make_session(test_server_version=False, **kwargs):
     # is too recent.  This is a way to ensure that tests don't fail due to a server mismatch.
     if test_server_version:
         connected_version = _get_server_version_for_test(session, curtail_length=3)
-        advertised_version = _IRODS_VERSION[:3]
+        advertised_version = _IRODS_VERSION()[:3]
         if connected_version > advertised_version:
             msg = (
                 "Connected server is {connected_version}, "

irods/message/__init__.py

@@ -185,7 +185,11 @@ def ET(xml_type=(), server_version=None):
 # We avail ourselves of this macro in running tests to abort if the session has connected 
 # to a server that is too new.
 
-_IRODS_VERSION = (5, 0, 2, "d")
+# Deprecated.  Not for use external to the library.
+IRODS_VERSION = (5, 0, 2, "d")
+
+def _IRODS_VERSION():
+    return IRODS_VERSION
 
 UNICODE = str
 
@@ -477,8 +481,8 @@ def __init__(self, proxy_user, client_user, application_name=""):
             self.connectCnt = 0
             self.proxyUser, self.proxyRcatZone = proxy_user
             self.clientUser, self.clientRcatZone = client_user
-            self.relVersion = "rods{}.{}.{}".format(*_IRODS_VERSION)
-            self.apiVersion = "{3}".format(*_IRODS_VERSION)
+            self.relVersion = "rods{}.{}.{}".format(*_IRODS_VERSION())
+            self.apiVersion = "{3}".format(*_IRODS_VERSION())
             self.option = application_name
 
     irodsProt = IntegerProperty()