Make rate_limited use cvs.

[python_utils.git] / site_config.py

diff --git a/site_config.py b/site_config.py
index 2d0c4c3f866c748027ccc5ab84f15d2b0f26d554..492623f4b855fc990883a706db93dfd5615921d0 100644 (file)
--- a/site_config.py
+++ b/site_config.py
@@ -7,13 +7,13 @@ from typing import Callable
 
 # Note: this module is fairly early loaded.  Be aware of dependencies.
 import config
-from locations import Location
+from type.locations import Location
 
 logger = logging.getLogger(__name__)
 
 args = config.add_commandline_args(
-    f'({__file__})',
-    'Args related to __file__'
+    f'Global Site Config ({__file__})',
+    f'Args related to global site-specific configuration'
 )
 args.add_argument(
     '--site_config_override_location',
@@ -21,7 +21,7 @@ args.add_argument(
     const='NONE',
     nargs='?',
     choices=('HOUSE', 'CABIN', 'NONE'),
-    help='Where are we, HOUSE, CABIN?',
+    help='Where are we, HOUSE, CABIN?  Overrides standard detection code.',
 )
 
 
@@ -33,7 +33,7 @@ class SiteConfig(object):
     network_netmask: str
     network_router_ip: str
     presence_location: Location
-    is_anyone_present: Callable[None, bool]
+    is_anyone_present: Callable
     arper_minimum_device_count: int
 
 
@@ -53,7 +53,7 @@ def get_location():
     """
     Returns location as an enum instead of a string.
 
-    >>> from locations import Location
+    >>> from type.locations import Location
     >>> location = get_location()
     >>> location == Location.HOUSE or location == Location.CABIN
     True
@@ -63,8 +63,8 @@ def get_location():
 
 
 def is_anyone_present_wrapper(location: Location):
-    import presence
-    p = presence.PresenceDetection()
+    import base_presence
+    p = base_presence.PresenceDetection()
     return p.is_anyone_in_location_now(location)