Merge branch 'develop' into 'master'

Fix for Redis-py 3.0 See merge request glitterworld-prime-ssc/glitterworld-api!17
AdamLeyshon · Feb 24, 2019 · a14c5d7 · a14c5d7
2 parents 8b3ab5a + 444532f
commit a14c5d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Scripts/import_game_data.py b/Scripts/import_game_data.py
@@ -52,7 +52,7 @@
 
         # Set full name for Thing, Ours is the version of truth, give it a high score.
         pipe.zadd(lib.consts.KEY_THING_LOCALE_THING_NAMES.format(thing_data['LanguageCode'], thing.Hash),
-                  thing_data['LocalizedName'], 1000)
+                  {thing_data['LocalizedName']: 1000})
 
 count = len(pipe.execute())
 print('Wrote {} items'.format(count))
diff --git a/lib/colonies/colony.py b/lib/colonies/colony.py
@@ -271,7 +271,7 @@ def ping(self):
             pipe.zremrangebyscore(consts.KEY_BUCKET_COLONIES_ACTIVE, '-inf', '(' + str(epoch_start))
 
         # Add this colony to the set or update the score if it's already in it.
-        pipe.zadd(consts.KEY_BUCKET_COLONIES_ACTIVE, self.Hash, current_epoch)
+        pipe.zadd(consts.KEY_BUCKET_COLONIES_ACTIVE, {self.Hash: current_epoch})
 
         # Add this colony to set for current day if it's not already in it.
         pipe.sadd(consts.KEY_TRENDS_HISTORICAL_COLONIES_ACTIVE_BY_DATE.format(current_date), self.Hash)