Syncing latest changes between public/private.

.idea/dictionaries/ericf.xml

@@ -30,6 +30,7 @@
       <w>achs</w>
       <w>acinstance</w>
       <w>ack</w>
+      <w>ack'ed</w>
       <w>acked</w>
       <w>acks</w>
       <w>acnt</w>
@@ -149,6 +150,7 @@
       <w>badguy</w>
       <w>bafoundation</w>
       <w>ballistica</w>
+      <w>ballistica's</w>
       <w>ballisticacore</w>
       <w>ballisticacorecb</w>
       <w>bamaster</w>
@@ -204,6 +206,7 @@
       <w>bools</w>
       <w>bootlocale</w>
       <w>borhani</w>
+      <w>bot's</w>
       <w>botdist</w>
       <w>botlist</w>
       <w>botpos</w>
@@ -607,6 +610,7 @@
       <w>etsel</w>
       <w>etxt</w>
       <w>etype</w>
+      <w>eval'ed</w>
       <w>evalpydata</w>
       <w>evel</w>
       <w>eventid</w>
@@ -631,6 +635,10 @@
       <w>extrahash</w>
       <w>extrascale</w>
       <w>exts</w>
+      <w>f'baseval</w>
+      <w>f'chmod</w>
+      <w>f'final</w>
+      <w>f'fixme</w>
       <w>factoryclass</w>
       <w>fakemodule</w>
       <w>fallbacks</w>
@@ -772,6 +780,7 @@
       <w>gameinstance</w>
       <w>gamemap</w>
       <w>gamepad</w>
+      <w>gamepad's</w>
       <w>gamepadadvanced</w>
       <w>gamepads</w>
       <w>gamepadselect</w>
@@ -1141,6 +1150,7 @@
       <w>lssl</w>
       <w>lstart</w>
       <w>lstr</w>
+      <w>lstr's</w>
       <w>lstrs</w>
       <w>lsval</w>
       <w>ltex</w>
@@ -1337,6 +1347,7 @@
       <w>nvcompress</w>
       <w>nvidia</w>
       <w>nyko</w>
+      <w>obj's</w>
       <w>objname</w>
       <w>objs</w>
       <w>objt</w>
@@ -1578,6 +1589,7 @@
       <w>pybee</w>
       <w>pybuild</w>
       <w>pycache</w>
+      <w>pycharm's</w>
       <w>pycharmbin</w>
       <w>pycharmfull</w>
       <w>pycharmroot</w>
@@ -1760,6 +1772,7 @@
       <w>sessionplayer</w>
       <w>sessionplayers</w>
       <w>sessionteam</w>
+      <w>sessionteam's</w>
       <w>sessionteams</w>
       <w>sessiontype</w>
       <w>setactivity</w>
@@ -1906,6 +1919,7 @@
       <w>subpath</w>
       <w>subplatform</w>
       <w>subplatforms</w>
+      <w>subprocess's</w>
       <w>subprocesses</w>
       <w>subrepos</w>
       <w>subsel</w>
@@ -2016,6 +2030,7 @@
       <w>thelaststand</w>
       <w>themself</w>
       <w>thingie</w>
+      <w>this'll</w>
       <w>threadtype</w>
       <w>throwiness</w>
       <w>timedisplay</w>
@@ -2084,6 +2099,7 @@
       <w>typeargs</w>
       <w>typecheck</w>
       <w>typechecker</w>
+      <w>typechecker's</w>
       <w>typedval</w>
       <w>typeshed</w>
       <w>typestr</w>

CHANGELOG.md

@@ -3,6 +3,7 @@
 - Windows debug builds now use Python debug libraries. This should hopefully catch more errors that would otherwise go undetected and potentially cause crashes.
 - Switched windows builds to use 'fast' mode math instead of 'strict'. This should make the game run more efficiently (similar modes are already in use on other platforms) but holler if any odd breakage happens such as things falling through floors (more often than the occasional random fluke-y case that happens now).
 - Added _ba.can_display_full_unicode() for any code that wants to avoid printing things that won't show up locally.
+- Now pulling some classes such as Literal and Protocol from typing instead of typing_extensions (they were officially added to Python in 3.8)
 
 ### 1.5.23 (20146)
 - Fixed the shebang line in `bombsquad_server` file by using `-S` flag for `/usr/bin/env`.

assets/src/ba_data/python/_ba.py

@@ -54,8 +54,7 @@ from ba._enums import TimeFormat, TimeType
 
 if TYPE_CHECKING:
     from typing import (Any, Dict, Callable, Tuple, List, Optional, Union,
-                        List, Type)
-    from typing_extensions import Literal
+                        List, Type, Literal)
     from ba._app import App
     import ba
 

assets/src/ba_data/python/ba/_actor.py

@@ -30,9 +30,7 @@ from ba._error import print_exception, ActivityNotFoundError
 import _ba
 
 if TYPE_CHECKING:
-    from typing import Any, Optional
-    from typing_extensions import Literal
-
+    from typing import Any, Optional, Literal
     import ba
 
 T = TypeVar('T', bound='Actor')

assets/src/ba_data/python/ba/_general.py

@@ -26,8 +26,7 @@ import types
 import weakref
 import random
 import inspect
-from typing import TYPE_CHECKING, TypeVar
-from typing_extensions import Protocol
+from typing import TYPE_CHECKING, TypeVar, Protocol
 
 from efro.terminal import Clr
 from ba._error import print_error, print_exception

assets/src/ba_data/python/bastd/actor/onscreentimer.py

@@ -26,8 +26,7 @@ from typing import TYPE_CHECKING, overload
 import ba
 
 if TYPE_CHECKING:
-    from typing import Optional, Union, Any
-    from typing_extensions import Literal
+    from typing import Optional, Union, Any, Literal
 
 
 class OnScreenTimer(ba.Actor):

assets/src/ba_data/python/bastd/actor/playerspaz.py

@@ -28,8 +28,7 @@ import ba
 from bastd.actor.spaz import Spaz
 
 if TYPE_CHECKING:
-    from typing import Any, Sequence, Tuple, Optional, Type
-    from typing_extensions import Literal
+    from typing import Any, Sequence, Tuple, Optional, Type, Literal
 
 PlayerType = TypeVar('PlayerType', bound=ba.Player)
 TeamType = TypeVar('TeamType', bound=ba.Team)

config/toolconfigsrc/pylintrc

@@ -62,7 +62,7 @@ disable=broad-except,
 enable=useless-suppression
 
 [BASIC]
-# Allowing a handfull of short names commonly understood to be iterators,
+# Allowing a handful of short names commonly understood to be iterators,
 # math concepts, or temporary variables.
 
 good-names=i,

docs/ba_module.md

@@ -1,5 +1,5 @@
 <!-- THIS FILE IS AUTO GENERATED; DO NOT EDIT BY HAND -->
-<h4><em>last updated on 2020-08-02 for Ballistica version 1.5.24 build 20160</em></h4>
+<h4><em>last updated on 2020-08-02 for Ballistica version 1.5.24 build 20162</em></h4>
 <p>This page documents the Python classes and functions in the 'ba' module,
  which are the ones most relevant to modding in Ballistica. If you come across something you feel should be included here or could be better explained, please <a href="mailto:support@froemling.net">let me know</a>. Happy modding!</p>
 <hr>

tools/batools/build.py

@@ -47,9 +47,9 @@ class PipRequirement:
 
 PIP_REQUIREMENTS = [
     PipRequirement(modulename='pylint', minversion=[2, 5, 3]),
-    PipRequirement(modulename='mypy', minversion=[0, 781]),
+    PipRequirement(modulename='mypy', minversion=[0, 782]),
     PipRequirement(modulename='yapf', minversion=[0, 30, 0]),
-    PipRequirement(modulename='cpplint', minversion=[1, 5, 1]),
+    PipRequirement(modulename='cpplint', minversion=[1, 5, 3]),
     PipRequirement(modulename='typing_extensions'),
     PipRequirement(modulename='pytz'),
     PipRequirement(modulename='yaml', pipname='PyYAML'),

tools/efro/entity/util.py

@@ -101,10 +101,11 @@ def have_matching_fields(val1: CompoundValue, val2: CompoundValue) -> bool:
 
     Note this just refers to the field configuration; not data.
     """
-    # quick-out: matching types will always have identical fields
+    # Quick-out: matching types will always have identical fields.
     if type(val1) is type(val2):
         return True
-    # otherwise do a full comparision
+
+    # Otherwise do a full comparison.
     return val1.get_fields() == val2.get_fields()
 
 

tools/efrotools/__init__.py

@@ -37,8 +37,7 @@ from pathlib import Path
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from typing import Dict, Union, Sequence, Optional, Any
-    from typing_extensions import Literal
+    from typing import Dict, Union, Sequence, Optional, Any, Literal
 
 # Python major version we're using for all this stuff.
 PYVER = '3.8'

tools/efrotools/pcommand.py

@@ -162,10 +162,14 @@ def spelling_all() -> None:
             capture_output=True).stdout.decode().splitlines()
         if 'Typo: In word' in line
     ]
-    words = [
-        line.split('Typo: In word')[1].strip().replace("'", '')
-        for line in lines
-    ]
+    words = [line.split('Typo: In word')[1].strip() for line in lines]
+
+    # Strip enclosing quotes but not internal ones.
+    for i, word in enumerate(words):
+        assert word[0] == "'"
+        assert word[-1] == "'"
+        words[i] = word[1:-1]
+
     _spelling(words)