Skip to content

Commit ba0cbae

Browse files
committed
expose replica sort functions as public
1 parent 60f8f46 commit ba0cbae

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

irods/data_object.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,19 @@ class _repl_status(enum.Enum):
6464
_REFERENCE_DATETIME = datetime.fromtimestamp(0, UTC)
6565

6666

67-
def _REPLICA_NUMBER_SORT_KEY_FN(row):
67+
def REPLICA_NUMBER_SORT_KEY_FN(row):
6868
return row[DataObject.replica_number]
6969

7070

71-
def _REPLICA_FITNESS_SORT_KEY_FN(row):
71+
def REPLICA_FITNESS_SORT_KEY_FN(row):
7272
repl_status = int(row[DataObject.replica_status])
7373

7474
repl_status_rank = _REPL_STATUSES.index(repl_status) if _REPL_STATUSES.count(repl_status) else sys.maxsize
7575

7676
return (repl_status_rank, _REFERENCE_DATETIME - row[DataObject.modify_time])
7777

7878

79-
_DEFAULT_SORT_KEY_FN = _REPLICA_NUMBER_SORT_KEY_FN
79+
_DEFAULT_SORT_KEY_FN = REPLICA_NUMBER_SORT_KEY_FN
8080

8181

8282
class iRODSDataObject:

irods/test/data_obj_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def is_localhost_synonym(name):
5555
from irods.test.helpers import iRODSUserLogins
5656
import irods.exception as ex
5757
from irods.column import Criterion
58-
from irods.data_object import chunks, irods_dirname, _REPLICA_FITNESS_SORT_KEY_FN
58+
from irods.data_object import chunks, irods_dirname, REPLICA_FITNESS_SORT_KEY_FN
5959
import irods.test.helpers as helpers
6060
import irods.test.modules as test_modules
6161
import irods.keywords as kw
@@ -3024,7 +3024,7 @@ def test_modified_sorting_of_replicas__issue_746(self):
30243024

30253025
options = {}
30263026
if irods.version.version_as_tuple() < (4,):
3027-
options['replica_sort_function'] = _REPLICA_FITNESS_SORT_KEY_FN
3027+
options['replica_sort_function'] = REPLICA_FITNESS_SORT_KEY_FN
30283028

30293029
# Get a data object with the PRC3-alternative/PRC4-default sort order.
30303030
data = self.sess.data_objects.get(data.path, **options)

0 commit comments

Comments
 (0)