remove dependency on six

piqueserver/config.py

@@ -20,8 +20,6 @@
 import os
 import sys
 
-import six
-
 import piqueserver
 import toml
 
@@ -83,7 +81,7 @@ def _validate_all(self):
 
     # https://stackoverflow.com/a/3233356/
     def _nested_update(self, config_dict, updates):
-        for k, v in six.iteritems(updates):
+        for k, v in updates.items():
             if isinstance(v, collections.Mapping):
                 config_dict[k] = self._nested_update(config_dict.get(k, {}), v)
             else:
@@ -158,7 +156,7 @@ def check_unused(self):
         '''
 
         unused = {}
-        for k, v in six.iteritems(self.get_dict()):
+        for k, v in self.get_dict().items():
             if isinstance(v, collections.Mapping):
                 if k in self._sections:
                     section_unused = self._sections[k].check_unused()

piqueserver/config/maps/random.txt

@@ -1,6 +1,5 @@
 # vi: ft=python
 import random
-from six.moves import range
 from pyspades import mapmaker
 
 name = 'Random'

piqueserver/game_modes/arena.py

@@ -37,8 +37,6 @@
 
 import random
 import math
-from six import itervalues
-from six.moves import range
 from pyspades.contained import BlockAction, SetColor, BlockLine
 from pyspades import world
 from pyspades.constants import DESTROY_BLOCK, TEAM_CHANGE_KILL, CTF_MODE
@@ -489,7 +487,7 @@ def destroy_gates(self):
                 gate.destroy_gate()
 
         def arena_spawn(self):
-            for player in list(itervalues(self.players)):
+            for player in list(self.players.values()):
                 if player.team.spectator:
                     continue
                 if player.world_object is not None and player.world_object.dead:
@@ -500,7 +498,7 @@ def arena_spawn(self):
                     player.refill()
 
         def refill_all(self):
-            for player in itervalues(self.players):
+            for player in self.players.values():
                 if player.team.spectator:
                     continue
                 player.refill()

piqueserver/game_modes/babel.py

@@ -7,7 +7,6 @@
 http://www.buildandshoot.com/viewtopic.php?t=2586
 """
 
-from six.moves import range
 from pyspades.constants import CTF_MODE
 from pyspades.collision import vector_collision
 

piqueserver/game_modes/babel_script.py

@@ -19,7 +19,6 @@
 """
 
 from random import randint
-from six.moves import range
 from pyspades.constants import (BLUE_BASE, GREEN_BASE, BLUE_FLAG, GREEN_FLAG,
                                 SPADE_TOOL, GRENADE_TOOL, WEAPON_TOOL)
 from twisted.internet import reactor

piqueserver/game_modes/infiltration.py

@@ -10,8 +10,6 @@
 Maintainer: TheGrandmaster / hompy
 """
 
-from six import itervalues
-from six.moves import range
 from twisted.internet.reactor import callLater
 from twisted.internet.task import LoopingCall
 from pyspades.player import create_player, player_left, intel_capture
@@ -82,7 +80,7 @@ def score(self):
             self.team.other.initialize()
             for entity in self.protocol.entities:
                 entity.update()
-            for player in list(itervalues(self.protocol.players)):
+            for player in list(self.protocol.players.values()):
                 player.hp = None
                 if player.team is not None:
                     player.spawn()

piqueserver/game_modes/onectf.py

@@ -1,4 +1,3 @@
-from six.moves import range
 from pyspades.constants import *
 from pyspades.collision import vector_collision
 

piqueserver/game_modes/push.py

@@ -36,7 +36,6 @@
 """
 
 
-from six.moves import range
 from pyspades.constants import *
 from pyspades.common import make_color
 from pyspades.contained import SetColor, BlockAction

piqueserver/game_modes/tow.py

@@ -7,7 +7,6 @@
 
 import random
 import math
-from six.moves import range
 from pyspades.constants import TC_MODE
 from pyspades.server import Territory
 

piqueserver/irc.py

@@ -21,7 +21,6 @@
 import random
 from itertools import groupby, chain
 from operator import attrgetter
-from six.moves import zip
 
 from twisted.words.protocols import irc
 from twisted.internet import reactor, protocol

piqueserver/networkdict.py

@@ -1,4 +1,3 @@
-from six import text_type
 from ipaddress import ip_network, ip_address
 
 def get_cidr(network):
@@ -24,7 +23,7 @@ def make_list(self):
         return values
 
     def remove(self, key):
-        ip = ip_network(text_type(key), strict=False)
+        ip = ip_network(str(key), strict=False)
         networks = []
         results = []
         for item in self.networks:
@@ -37,13 +36,13 @@ def remove(self, key):
         return results
 
     def __setitem__(self, key, value):
-        self.networks.append((ip_network(text_type(key), strict=False), value))
+        self.networks.append((ip_network(str(key), strict=False), value))
 
     def __getitem__(self, key):
         return self.get_entry(key)[1]
 
     def get_entry(self, key):
-        ip = ip_address(text_type(key))
+        ip = ip_address(str(key))
         for entry in self.networks:
             network, _value = entry
             if ip in network:
@@ -54,7 +53,7 @@ def __len__(self):
         return len(self.networks)
 
     def __delitem__(self, key):
-        ip = ip_network(text_type(key), strict=False)
+        ip = ip_network(str(key), strict=False)
         self.networks = [item for item in self.networks if ip not in item]
 
     def pop(self, *arg, **kw):

piqueserver/run.py

@@ -5,12 +5,12 @@
 import shutil
 import sys
 import argparse
-import six.moves.urllib as urllib
 import gzip
 import json
 
 from piqueserver.config import (config, TOML_FORMAT, JSON_FORMAT,
                                 MAXMIND_DOWNLOAD, SUPPORTED_PYTHONS)
+import urllib
 
 PKG_NAME = 'piqueserver'
 

piqueserver/scripts/afk.py

@@ -5,7 +5,6 @@
 """
 
 from operator import attrgetter
-from six import itervalues
 from twisted.internet import reactor
 from pyspades.common import prettify_timespan
 from piqueserver.commands import command, get_player, admin
@@ -37,7 +36,7 @@ def kick_afk(connection, minutes, amount=None):
     seconds = minutes * 60.0
     minutes_s = prettify_timespan(seconds)
     lower_bound = reactor.seconds() - seconds
-    for conn in list(itervalues(protocol.connections)):
+    for conn in list(protocol.connections.values()):
         if not conn.admin and conn.last_activity < lower_bound:
             to_kick.append(conn)
     if not to_kick:

piqueserver/scripts/aimbot2.py

@@ -5,7 +5,6 @@
 """
 # So we can do `x / y` instead of `float(x) / y`
 from __future__ import division
-from six.moves import range
 import os
 import csv
 import re

piqueserver/scripts/airstrike2.py

@@ -6,7 +6,6 @@
 
 from math import ceil, sin, cos
 from random import uniform, vonmisesvariate
-from six.moves import range
 from twisted.internet import reactor
 from pyspades.contained import GrenadePacket
 from pyspades.common import to_coordinates, Vertex3

piqueserver/scripts/flagreturn.py

@@ -5,7 +5,6 @@
 fixed by learn_more
 """
 
-from six import itervalues
 from pyspades.collision import vector_collision
 
 
@@ -41,7 +40,7 @@ class ReturnProtocol(protocol):
 
         def set_map(self, map):
             protocol.set_map(self, map)
-            for team in itervalues(self.teams):
+            for team in self.teams.values():
                 if team.spectator:
                     continue
                 team.flag.out = False

piqueserver/scripts/grownade.py

@@ -45,7 +45,6 @@
 from random import choice
 from itertools import product
 from collections import deque, namedtuple
-from six.moves import range
 from twisted.internet.reactor import seconds
 from twisted.internet.task import LoopingCall
 from pyspades.contained import BlockAction, SetColor

piqueserver/scripts/mapmakingtools.py

@@ -1,6 +1,5 @@
 from math import atan2, sqrt, pi
 
-from six.moves import range
 from piqueserver.commands import command
 from pyspades.contained import BlockAction, SetColor
 from pyspades.constants import BUILD_BLOCK, DESTROY_BLOCK

piqueserver/scripts/markers.py

@@ -33,7 +33,6 @@
 from functools import partial
 from itertools import islice, chain
 from random import choice
-from six.moves import zip
 from twisted.internet.reactor import callLater, seconds
 from pyspades.world import cube_line
 from pyspades.contained import BlockAction, BlockLine, SetColor, ChatMessage

piqueserver/scripts/rollback.py

@@ -8,7 +8,6 @@
 import time
 import operator
 
-from six.moves import range
 from twisted.internet.task import LoopingCall
 from pyspades.vxl import VXLData
 from pyspades.contained import BlockAction, SetColor

piqueserver/scripts/runningman.py

@@ -12,7 +12,6 @@
 """
 
 from random import choice
-from six.moves import filter
 from twisted.internet.reactor import seconds
 from pyspades.world import Grenade
 from pyspades.contained import GrenadePacket

piqueserver/scripts/smartnade.py

@@ -4,7 +4,6 @@
 Warning: conflicts with `minefield` script.
 '''
 
-from six import itervalues
 
 SMARTNADE_DELAY = 0.5
 
@@ -13,7 +12,7 @@ def apply_script(protocol, connection, config):
     class SmartNadeProtocol(protocol):
 
         def on_world_update(self):
-            for player in list(itervalues(self.players)):
+            for player in list(self.players.values()):
                 for nade in player.smart_nades:
                     if nade.fuse > SMARTNADE_DELAY:
                         for enemy in player.team.other.get_players():

piqueserver/scripts/squad.py

@@ -5,7 +5,6 @@
 """
 
 import random
-from six import itervalues, iterkeys
 from piqueserver.commands import command, get_player
 from piqueserver import commands
 from piqueserver.config import config
@@ -53,7 +52,7 @@ def squad(self, squadkey=None):
     if squadkey is None:
         allsquads = self.get_squads(self.team)
         result = []
-        for squadkey in list(iterkeys(allsquads)):
+        for squadkey in list(allsquads.keys()):
             result.append(self.print_squad(
                 squadkey, allsquads[squadkey]))
         result.append(('To join squads: /squad <squad name>. ' +
@@ -88,13 +87,13 @@ def on_login(self, name):
         def get_squad(self, team, squadkey):
             result = {'name': squadkey, 'players': []}
             if squadkey is None:
-                for player in list(itervalues(self.protocol.players)):
+                for player in list(self.protocol.players.values()):
                     if (player.team is team and
                             player.squad is None):
                         result['players'].append(player)
                         result['name'] = player.squad
             else:
-                for player in list(itervalues(self.protocol.players)):
+                for player in list(self.protocol.players.values()):
                     if (player.team is team and player.squad and
                             player.squad.lower() == squadkey.lower()):
                         result['players'].append(player)
@@ -103,7 +102,7 @@ def get_squad(self, team, squadkey):
 
         def get_squads(self, team):
             squad_dict = {}
-            for player in list(itervalues(self.protocol.players)):
+            for player in list(self.protocol.players.values()):
                 if player.team is team:
                     if player.squad in squad_dict:
                         squad_list = squad_dict[player.squad]
@@ -206,7 +205,7 @@ def leave_squad(self):
                                      self.name)
             self.squad = None
             self.squad_pref = None
-            for player in list(itervalues(self.protocol.players)):
+            for player in list(self.protocol.players.values()):
                 if player.squad_pref is self:
                     player.squad_pref = None
             self.respawn_time = self.protocol.respawn_time

piqueserver/scripts/strongblock.py

@@ -8,7 +8,6 @@
 """
 
 from collections import namedtuple
-from six import iteritems
 from pyspades.contained import BlockAction, SetColor
 from pyspades.common import make_color
 from pyspades.color import rgb_distance
@@ -58,7 +57,7 @@ class StrongBlockConnection(connection):
 
         def on_disconnect(self):
             strong_blocks = self.protocol.strong_blocks
-            for xyz, strong_block in iteritems(strong_blocks):
+            for xyz, strong_block in strong_blocks.items():
                 if strong_block.owner is self:
                     strong_blocks[xyz] = strong_block._replace(owner=None)
             connection.on_disconnect(self)

piqueserver/scripts/votekick.py

@@ -19,7 +19,6 @@
 
 
 from __future__ import print_function
-from six import itervalues
 from twisted.internet.reactor import seconds
 from piqueserver.scheduler import Scheduler
 from piqueserver.commands import command, admin, get_player, join_arguments, CommandError
@@ -266,7 +265,7 @@ class VotekickProtocol(protocol):
         def get_required_votes(self):
             # votekicks are invalid if this returns <= 0
             player_count = sum(not player.disconnected and not player.local
-                               for player in itervalues(self.players)) - 1
+                               for player in self.players.values()) - 1
             return int(player_count / 100.0 * REQUIRED_PERCENTAGE_OPTION.get())
 
         def on_map_leave(self):

piqueserver/scripts/votemap.py

@@ -16,7 +16,6 @@
 # along with pyspades.  If not, see <http://www.gnu.org/licenses/>.
 
 import random
-from six import iterkeys, itervalues
 from twisted.internet import reactor
 from twisted.internet.task import LoopingCall
 from pyspades.common import prettify_timespan
@@ -70,7 +69,7 @@ def votes_left(self):
         thresh = int((len(self.protocol.players)) *
                      self.vote_percentage / 100.0)
         counts = {}
-        for v in list(itervalues(self.votes)):
+        for v in list(self.votes.values()):
             if v in counts:
                 counts[v]['count'] += 1
             else:
@@ -79,7 +78,7 @@ def votes_left(self):
         if len(cvlist) <= 0:
             return {'name': self.picks[0], 'count': 0}
         mv = cvlist[0]
-        for n in list(iterkeys(counts)):
+        for n in list(counts.keys()):
             if counts[n]['count'] > mv['count']:
                 mv = n
         mv['count'] = thresh - mv['count']