Preserve order and return id36 keys in Thing._byID36.

2026-02-07 05:04:55 -05:00 · 2013-04-20 15:57:28 -04:00
parent 1a6bddaf24
commit 0b58ac9ca0
1 changed files with 2 additions and 1 deletions
--- a/r2/r2/lib/db/thing.py
+++ b/r2/r2/lib/db/thing.py
@@ -455,13 +455,14 @@ class DataThing(object):
        ids = [ int(x, 36) for x in id36s ]

        things = cls._byID(ids, return_dict=True, **kw)
+        things = {thing._id36: thing for thing in things.itervalues()}

        if single:
            return things.values()[0]
        elif return_dict:
            return things
        else:
-            return things.values()
+            return filter(None, (things.get(i) for i in id36s))

    @classmethod
    def _by_fullname(cls, names,