merge dev server

onionr/communicatorutils/uploadblocks/__init__.py

@@ -19,8 +19,6 @@ from __future__ import annotations
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 '''
 from typing import Union, TYPE_CHECKING
-import threading
-
 import logger
 from communicatorutils import proxypicker
 import onionrexceptions

onionr/communicatorutils/uploadblocks/sessionmanager.py

@@ -82,4 +82,4 @@ class BlockUploadSessionManager:
                 comm_inst.blocksToUpload.remove(session.block_hash)
             except ValueError:
                 pass
-            localcommand.local_command('waitforshare/{session.block_hash}')
+            localcommand.local_command('waitforshare/{session.block_hash}')