fix tests imports, add sed for fixing pb2 imports

Author: rc14193

bin/regen-protobufs.sh

@@ -7,13 +7,18 @@
 ./nanopb-0.4.7/generator-bin/protoc -I=protobufs --python_out ./ ./protobufs/meshtastic/*.proto
 
 # workaround for import bug in protoc https://github.com/protocolbuffers/protobuf/issues/1491#issuecomment-690618628
+mv ./meshtastic/*_pb2.py ./meshtastic/pbDefinitions
 
 if [[ $OSTYPE == 'darwin'* ]]; then
-	sed -i '' -E 's/^(import.*_pb2)/from . \1/' meshtastic/*.py
+	sed -i '' -E 's/^(import.*_pb2)/from . \1/' meshtastic/pbDefinitions/*.py
 	# automate the current workaround (may be related to Meshtastic-protobufs issue #27 https://github.com/meshtastic/protobufs/issues/27)
-	sed -i '' -E "s/^None = 0/globals()['None'] = 0/" meshtastic/mesh_pb2.py
+	sed -i '' -E "s/^None = 0/globals()['None'] = 0/" meshtastic/pbDefinitions/mesh_pb2.py
+	# change from meshtastic to meshtastic.pbDefinitions
+	sed -i -E 's/^from meshtastic(.*_pb2.*)/from meshtastic.pbDefinitions\1/' meshtastic/pbDefinitions/*.py
 else
-	sed -i -e 's/^import.*_pb2/from . \0/' meshtastic/*.py
+	sed -i -e 's/^import.*_pb2/from . \0/' meshtastic/pbDefinitions/*.py
 	# automate the current workaround (may be related to Meshtastic-protobufs issue #27 https://github.com/meshtastic/protobufs/issues/27)
-	sed -i -e "s/^None = 0/globals()['None'] = 0/" meshtastic/mesh_pb2.py
+	sed -i -e "s/^None = 0/globals()['None'] = 0/" meshtastic/pbDefinitions/mesh_pb2.py
+	# change from meshtastic to meshtastic.pbDefinitions
+	sed -i -E 's/^from meshtastic(.*_pb2.*)/from meshtastic.pbDefinitions\1/' meshtastic/pbDefinitions/*.py
 fi

meshtastic/__init__.py

@@ -86,7 +86,6 @@ def onConnection(interface, topic=pub.AUTO_TOPIC): # called when we (re)connect
     mesh_pb2,
     portnums_pb2,
     remote_hardware_pb2,
-    util,
 )
 from meshtastic.node import Node
 from meshtastic.pbDefinitions import telemetry_pb2

meshtastic/__main__.py

@@ -17,7 +17,8 @@
 
 import meshtastic.test
 import meshtastic.util
-from meshtastic.pbDefinitions import channel_pb2, config_pb2, portnums_pb2, remote_hardware
+from meshtastic.pbDefinitions import channel_pb2, config_pb2, portnums_pb2
+from meshtastic import remote_hardware
 from meshtastic.__init__ import BROADCAST_ADDR
 from meshtastic.ble_interface import BLEInterface
 from meshtastic.globals import Globals