From 4aa8e2ca0e3fbcb80cf07b308d7f8cde843a42e2 Mon Sep 17 00:00:00 2001
From: A_D <aunderscored@gmail.com>
Date: Tue, 7 Jul 2020 18:42:16 +0200
Subject: [PATCH] Added variable for re-used accesses
The last starport ID and name was repeatedly accessed out of a dict,
making lines longer and harder to parse
---
companion.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/companion.py b/companion.py
index 501b56bd..3909199b 100644
--- a/companion.py
+++ b/companion.py
@@ -439,10 +439,12 @@ class Session(object):
if data['commander'].get('docked'):
services = data['lastStarport'].get('services', {})
- if services.get('commodities'):
+ last_starport_name = data['lastStarport']['name']
+ last_starport_id = int(data['lastStarport']['id'])
+ if services.get('commodities'):
marketdata = self.query(URL_MARKET)
- if (data['lastStarport']['name'] != marketdata['name'] or int(data['lastStarport']['id']) != int(marketdata['id'])):
+ if (last_starport_name != marketdata['name'] or last_starport_id != int(marketdata['id'])):
raise ServerLagging()
else:
@@ -450,7 +452,7 @@ class Session(object):
if services.get('outfitting') or services.get('shipyard'):
shipdata = self.query(URL_SHIPYARD)
- if (data['lastStarport']['name'] != shipdata['name'] or int(data['lastStarport']['id']) != int(shipdata['id'])):
+ if (last_starport_name != shipdata['name'] or last_starport_id != int(shipdata['id'])):
raise ServerLagging()
else: