Skip to content
This repository was archived by the owner on Apr 27, 2019. It is now read-only.

Commit 60845cd

Browse files
committed
[142] Changes kharidiron requested
1 parent 732ba3c commit 60845cd

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

plugins/poi_plugin/poi_plugin.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def activate(self):
2222
'player_manager_plugin'
2323
].player_manager
2424
try:
25-
with open(os.path.join('config', 'pois.json')) as f:
25+
with open(os.path.join('config', 'pois.json'), 'r') as f:
2626
self.pois = json.load(f)
2727
except:
2828
self.pois = []
@@ -93,10 +93,7 @@ def poi(self, name):
9393
"""
9494
name = ' '.join(name).strip().strip('\t')
9595
if not name:
96-
warps = []
97-
for warp in self.pois:
98-
if warps:
99-
warps.append(warp[1])
96+
warps = [warp[1] for warp in self.pois]
10097
warpnames = '^green;, ^yellow;'.join(warps)
10198
if not warpnames:
10299
warpnames = '^gray;(none)^green;'
@@ -173,7 +170,7 @@ def spawn(self, data):
173170

174171
def savepois(self):
175172
try:
176-
with open(os.path.join('config' 'pois.json', 'wb')) as f:
173+
with open(os.path.join('config', 'pois.json'), 'wb') as f:
177174
json.dump(self.pois, f)
178175
except:
179176
self.logger.exception('Couldn\'t save PoI\'s.')

tests/test_plugin_manager.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,3 +247,10 @@ def test_route_response_false(
247247

248248
mock_pm.do.assert_called_with(mock_self, 'on', 'data')
249249
self.assertFalse(mock_defer.called)
250+
251+
@patch.object(PluginManager, 'deactivate_plugins')
252+
def test_die(self, mock_deactivate):
253+
plugin_manager = PluginManager(Mock())
254+
255+
plugin_manager.die()
256+
self.assertTrue(mock_deactivate.called)

0 commit comments

Comments
 (0)