Close a file descriptor for dictionaries as they are read

Author: jporter-dev

server/__init__.py

@@ -60,27 +60,6 @@ def prune():
                 delete_room(key)
         del rooms
         gc.collect()
-        return
-        # if len(stale) > 0:
-        #     cur_path = os.path.dirname(os.path.abspath(__file__))
-        #     # add playtimes to master playtimes list
-        #     with open(os.path.join(cur_path, 'all-playtimes.txt'), 'a+') as f:
-        #         playtimes = [json.dumps([v['date_created'], v['playtime']])
-        #             for v in sorted(stale, key=lambda k: k.get('date_modified'))
-        #             if v['playtime'] > 10]
-        #         f.write("\r\n".join(playtimes))
-        #         del playtimes
-        #     # add custom words to master list
-        #     with open(os.path.join(cur_path, 'all-custom-words.txt'), 'a+') as f:
-        #         custom_words = [json.dumps(v['options']['custom'])
-        #         for v in stale if v['options']['custom'] is not False]
-        #         f.write("\r\n".join(custom_words))
-        #         del custom_words
-        #     # prune master rooms list
-        #     for game in stale:
-        #         del ROOMS[game.get('game_id')]
-        # del stale
-        # gc.collect()
 
 @app.route('/debug-sentry')
 def trigger_error():
@@ -158,10 +137,8 @@ def on_leave(data):
 @socketio.on('flip_card')
 def on_flip_card(data):
     """flip card and rebroadcast game object"""
-    room = data['room']
-    card = data['card']
-    ROOMS[room].flip_card(card)
-    send(ROOMS[room].to_json(), room=room)
+    ROOMS[data['room']].flip_card(data['card'])
+    send(ROOMS[data['room']].to_json(), room=data['room'])
 
 @socketio.on('regenerate')
 def on_regenerate(data):

server/codenames/game.py

@@ -116,10 +116,8 @@ def playtime(self):
         # Convert to Unix timestamp
         d1_ts = time.mktime(d1.timetuple())
         d2_ts = time.mktime(d2.timetuple())
-
         return round(float(d2_ts-d1_ts) / 60, 2)
 
-
     def __get_words(self, size):
         """Generate a list of words"""
         if not self.dictionary in DICTIONARIES.keys():
@@ -143,9 +141,9 @@ def __get_words(self, size):
         final_words = words[0:BOARD_SIZE[size]]
         return final_words
 
-    def __load_words(self, dict):
-        words_file = open(DICTIONARIES.get(dict), 'r')
-        return [elem for elem in words_file.read().split('\n') if len(elem.strip()) > 0]
+    def __load_words(self, d):
+        with open(DICTIONARIES.get(d), 'r') as words_file:
+            return [elem for elem in words_file.read().split('\n') if len(elem.strip()) > 0]
 
     def __get_layout(self, size, teams):
         """Randomly generate a card layout"""