From 88a5715f8c53852a6e231315d4aca361df2e6493 Mon Sep 17 00:00:00 2001
From: Philip Paquette <pcpaquette@gmail.com>
Date: Sun, 3 Mar 2019 13:56:26 -0500
Subject: Updated pylint to v2.3.0
---
diplomacy/engine/game.py | 5 ++---
diplomacy/server/notifier.py | 2 +-
diplomacy/tests/network/test_real_game.py | 2 +-
requirements_dev.txt | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/diplomacy/engine/game.py b/diplomacy/engine/game.py
index b639573..2c845e6 100644
--- a/diplomacy/engine/game.py
+++ b/diplomacy/engine/game.py
@@ -823,7 +823,7 @@ class Game(Jsonable):
return power_orders
# Recursively calling itself to get all powers
- elif power_name is None:
+ if power_name is None:
orders = {}
for power in self.powers.values():
orders[power.name] = self.get_orders(power.name)
@@ -873,8 +873,7 @@ class Game(Jsonable):
return sorted(orderable_locs)
# All powers
- else:
- return {power.name: self.get_orderable_locations(power.name) for power in self.powers.values()}
+ return {power.name: self.get_orderable_locations(power.name) for power in self.powers.values()}
def get_order_status(self, power_name=None, unit=None, loc=None):
""" Returns a list or a dict representing the order status ('', 'no convoy', 'bounce', 'void', 'cut',
diff --git a/diplomacy/server/notifier.py b/diplomacy/server/notifier.py
index 1c05335..4bd64d3 100644
--- a/diplomacy/server/notifier.py
+++ b/diplomacy/server/notifier.py
@@ -41,7 +41,7 @@ class Notifier():
# Expect a sequence of tokens to ignore.
# Convert it to a set.
- elif ignore_tokens:
+ if ignore_tokens:
self.ignore_tokens = set(ignore_tokens)
# Expect a sequence of tuples (power name, token) to ignore.
diff --git a/diplomacy/tests/network/test_real_game.py b/diplomacy/tests/network/test_real_game.py
index a16e4f6..94ecc19 100644
--- a/diplomacy/tests/network/test_real_game.py
+++ b/diplomacy/tests/network/test_real_game.py
@@ -254,7 +254,7 @@ def on_message_received(game, notification):
raise AssertionError(
'%s/there are still messages to send to %s (%d) before receiving messages from him. Received: %s'
% (power_name, power_from, expected_message.time_sent, notification.message.message))
- elif expected_message.sender == power_from:
+ if expected_message.sender == power_from:
if notification.message.is_global():
if not (expected_message.recipient == GLOBAL
and expected_message.message == notification.message.message):
diff --git a/requirements_dev.txt b/requirements_dev.txt
index 59526b7..c1984ef 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -1,5 +1,5 @@
-e .
-r requirements.txt
-pylint>=2.2.0
+pylint>=2.3.0
pytest
pytest-xdist
--
cgit v1.2.3