Various minor python 3 and 3.10 improvements.

PiperOrigin-RevId: 460481231

Author: tewalds

pysc2/env/BUILD

@@ -162,6 +162,8 @@ pytype_library(
         "//pysc2/lib:units",
         "//pysc2/tests:dummy_observation",
         "@s2client_proto//s2clientprotocol:common_py_pb2",
+        "@s2client_proto//s2clientprotocol:raw_py_pb2",
+        "@s2client_proto//s2clientprotocol:sc2api_py_pb2",
     ],
 )
 

pysc2/env/lan_sc2_env.py

@@ -203,8 +203,8 @@ class LanSC2Env(sc2_env.SC2Env):
   script, likely play_vs_agent.py.
   """
 
-  def __init__(self,  # pylint: disable=invalid-name
-               _only_use_kwargs=None,
+  def __init__(self,
+               *,
                host="127.0.0.1",
                config_port=None,
                race=None,
@@ -232,7 +232,6 @@ def __init__(self,  # pylint: disable=invalid-name
     height. If you specify size then both width and height will take that value.
 
     Args:
-      _only_use_kwargs: Don't pass args, only kwargs.
       host: Which ip to use. Either ipv4 or ipv6 localhost.
       config_port: Where to find the config port.
       race: Race for this agent.
@@ -260,9 +259,6 @@ def __init__(self,  # pylint: disable=invalid-name
       ValueError: if the resolutions aren't specified correctly.
       ValueError: if the host or port are invalid.
     """
-    if _only_use_kwargs:
-      raise ValueError("All arguments must be passed as keyword arguments.")
-
     if host not in ("127.0.0.1", "::1"):
       raise ValueError("Bad host arguments. Must be a localhost")
     if not config_port:

pysc2/env/mock_sc2_env.py

@@ -156,7 +156,7 @@ def test_method(self):
   """
 
   def __init__(self,
-               _only_use_kwargs=None,
+               *,
                map_name=None,
                players=None,
                agent_interface_format=None,
@@ -177,7 +177,6 @@ def __init__(self,
     """Initializes an SC2TestEnv.
 
     Args:
-      _only_use_kwargs: Don't pass args, only kwargs.
       map_name: Map name. Ignored.
       players: A list of Agent and Bot instances that specify who will play.
       agent_interface_format: A sequence containing one AgentInterfaceFormat per
@@ -222,9 +221,6 @@ def __init__(self,
     del ensure_available_actions  # Unused.
     del version  # Unused.
 
-    if _only_use_kwargs:
-      raise ValueError('All arguments must be passed as keyword arguments.')
-
     if realtime:
       raise ValueError('realtime mode is not supported by the mock env.')
 

pysc2/env/remote_sc2_env.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 """A Starcraft II environment for playing using remote SC2 instances."""
 
-import collections
+from typing import Sequence
 
 from absl import logging
 from pysc2 import maps
@@ -39,8 +39,8 @@ class RemoteSC2Env(sc2_env.SC2Env):
   This assumes a 2 player game, and works best with play_vs_agent.py.
   """
 
-  def __init__(self,  # pylint: disable=invalid-name
-               _only_use_kwargs=None,
+  def __init__(self,
+               *,
                map_name=None,
                save_map=True,
                host="127.0.0.1",
@@ -72,7 +72,6 @@ def __init__(self,  # pylint: disable=invalid-name
     documentation for further detail.
 
     Args:
-      _only_use_kwargs: Don't pass args, only kwargs.
       map_name: Name of a SC2 map. Run bin/map_list to get the full list of
           known maps. Alternatively, pass a Map instance. Take a look at the
           docs in maps/README.md for more information on available maps.
@@ -108,9 +107,6 @@ def __init__(self,  # pylint: disable=invalid-name
       ValueError: if the resolutions aren't specified correctly.
       ValueError: if lan_port is a sequence but its length != 4.
     """
-    if _only_use_kwargs:
-      raise ValueError("All arguments must be passed as keyword arguments.")
-
     if agent_interface_format is None:
       raise ValueError("Please specify agent_interface_format.")
 
@@ -144,7 +140,7 @@ def __init__(self,  # pylint: disable=invalid-name
     interface = self._get_interface(
         agent_interface_format=agent_interface_format, require_raw=visualize)
 
-    if isinstance(lan_port, collections.Sequence):
+    if isinstance(lan_port, Sequence):
       if len(lan_port) != 4:
         raise ValueError("lan_port sequence must be of length 4")
       ports = lan_port[:]

pysc2/env/sc2_env.py

@@ -94,8 +94,8 @@ class SC2Env(environment.Base):
   lib/features.py
   """
 
-  def __init__(self,  # pylint: disable=invalid-name
-               _only_use_kwargs=None,
+  def __init__(self,
+               *,
                map_name=None,
                battle_net_map=False,
                players=None,
@@ -126,7 +126,6 @@ def __init__(self,  # pylint: disable=invalid-name
     height. If you specify size then both width and height will take that value.
 
     Args:
-      _only_use_kwargs: Don't pass args, only kwargs.
       map_name: Name of a SC2 map. Run bin/map_list to get the full list of
           known maps. Alternatively, pass a Map instance. Take a look at the
           docs in maps/README.md for more information on available maps. Can
@@ -179,9 +178,6 @@ def __init__(self,  # pylint: disable=invalid-name
       ValueError: if wrong number of players are requested for a map.
       ValueError: if the resolutions aren't specified correctly.
     """
-    if _only_use_kwargs:
-      raise ValueError("All arguments must be passed as keyword arguments.")
-
     if not players:
       raise ValueError("You must specify the list of players.")