Move files into a module

tests.py

@@ -4,7 +4,7 @@
 from hypothesis import given, settings, HealthCheck
 from hypothesis.strategies import data, integers, binary, floats
 
-from proxy import splice
+from whitelisting_proxy.proxy import splice
 
 
 @given(integers(1, 100), data())
@@ -34,7 +34,7 @@ async def testit(a, b):
  nursery.start_soon(testit, client, server)
 
 
-from proxy import WhitelistingProxy, run_synchronously_cancellable_proxy
+from whitelisting_proxy.proxy import WhitelistingProxy, run_synchronously_cancellable_proxy
 
 # Thread scheduling varies, so we cannot reliably (nor quickly) test
 # if SynchronousWhitelistingProxy cancellation works, i.e. that:

whitelisting_proxy/__init__.py

@@ -0,0 +1,9 @@
+from .proxy import (
+ WhitelistingProxy,
+ SynchronousWhitelistingProxy,
+ Port,
+ Domain,
+ Configuration,
+ parse_configuration_v1,
+ load_configuration_from_file,
+)

main.py → whitelisting_proxy/__main__.py

@@ -1,7 +1,7 @@
 import trio, threading, signal, argparse, sys
 from functools import partial
 from typing import Union, Tuple, Set
-from proxy import WhitelistingProxy, SynchronousWhitelistingProxy, load_configuration_from_file
+from .proxy import WhitelistingProxy, SynchronousWhitelistingProxy, load_configuration_from_file
 
 if __name__ == "__main__":
  parser = argparse.ArgumentParser()

proxy.py → whitelisting_proxy/proxy.py

@@ -1,5 +1,5 @@
 import trio, h11, threading, re, json
-from adapter import TrioHTTPConnection
+from .adapter import TrioHTTPConnection
 from functools import partial
 from dataclasses import dataclass
 from typing import Callable, Union, Iterable, Tuple, Set