packet.Payload needs to be translated to text in some cases

access/key_ring.py

@@ -55,9 +55,9 @@
 
 from logs import lg
 
-from contacts import identitycache
+from lib import strng
 
-from userid import my_id
+from contacts import identitycache
 
 from p2p import propagate
 from p2p import p2p_service
@@ -93,7 +93,7 @@ def _do_request_service_keys_registry(key_id, idurl, include_private, timeout, r
 
 
 def _on_service_keys_registry_response(response, info, key_id, idurl, include_private, result, timeout):
-    if not response.Payload.startswith('accepted'):
+    if not strng.to_text(response.Payload).startswith('accepted'):
         result.errback(Exception('request for "service_keys_registry" refused by remote node'))
         return
     d = transfer_key(

broadcast/broadcasters_finder.py

@@ -57,11 +57,14 @@
 
 from automats import automat
 
+from lib import strng
+
 from p2p import commands
 from p2p import p2p_service
 from p2p import lookup
 
 from contacts import identitycache
+
 from userid import my_id
 
 from transport import callback
@@ -254,7 +257,7 @@ def _inbox_packet_received(self, newpacket, info, status, error_message):
     def _node_acked(self, response, info):
         if _Debug:
             lg.out(_DebugLevel, 'broadcasters_finder._node_acked %r %r' % (response, info))
-        if not response.Payload.startswith('accepted'):
+        if not strng.to_text(response.Payload).startswith('accepted'):
             if _Debug:
                 lg.out(_DebugLevel, 'broadcasters_finder._node_acked with service denied %r %r' % (response, info))
             self.automat('service-denied')

coins/accountants_finder.py

@@ -56,11 +56,14 @@
 
 from automats import automat
 
+from lib import strng
+
 from p2p import commands
 from p2p import p2p_service
 from p2p import lookup
 
 from contacts import identitycache
+
 from userid import my_id
 
 from transport import callback
@@ -268,7 +271,7 @@ def _inbox_packet_received(self, newpacket, info, status, error_message):
     def _node_acked(self, response, info):
         if _Debug:
             lg.out(_DebugLevel, 'accountants_finder._node_acked %r %r' % (response, info))
-        if not response.Payload.startswith('accepted'):
+        if not strng.to_text(response.Payload).startswith('accepted'):
             if _Debug:
                 lg.out(_DebugLevel, 'accountants_finder._node_acked with service denied %r %r' % (response, info))
             self.automat('service-denied')

customer/supplier_connector.py

@@ -70,6 +70,7 @@
 
 from main import settings
 
+from lib import strng
 from lib import nameurl
 from lib import diskspace
 
@@ -324,7 +325,7 @@ def isServiceAccepted(self, arg):
         Condition method.
         """
         newpacket = arg
-        if newpacket.Payload.startswith('accepted'):
+        if strng.to_text(newpacket.Payload).startswith('accepted'):
             if _Debug:
                 lg.out(6, 'supplier_connector.isServiceAccepted !!!! supplier %s connected' % self.supplier_idurl)
             return True
@@ -336,7 +337,7 @@ def isServiceCancelled(self, arg):
         """
         newpacket = arg
         if newpacket.Command == commands.Ack():
-            if newpacket.Payload.startswith('accepted'):
+            if strng.to_text(newpacket.Payload).startswith('accepted'):
                 if _Debug:
                     lg.out(6, 'supplier_connector.isServiceCancelled !!!! supplier %s disconnected' % self.supplier_idurl)
                 return True

p2p/p2p_service_seeker.py

@@ -60,6 +60,8 @@
 
 from automats import automat
 
+from lib import strng
+
 from p2p import commands
 from p2p import p2p_service
 from p2p import lookup
@@ -289,7 +291,7 @@ def _inbox_packet_received(self, newpacket, info, status, error_message):
     def _node_acked(self, response, info):
         if _Debug:
             lg.out(_DebugLevel, 'p2p_service_seeker._node_acked %r %r' % (response, info))
-        if not response.Payload.startswith('accepted'):
+        if not strng.to_text(response.Payload).startswith('accepted'):
             if _Debug:
                 lg.out(_DebugLevel, 'p2p_service_seeker._node_acked with service denied %r %r' % (response, info))
             self.automat('service-denied')

services/service_supplier.py

@@ -330,13 +330,14 @@ def _on_delete_file(self, newpacket):
         import os
         from logs import lg
         from system import bpio
+        from lib import strng
         from userid import global_id
         from p2p import p2p_service
         from main import events
         if not newpacket.Payload:
             ids = [newpacket.PacketID, ]
         else:
-            ids = newpacket.Payload.split('\n')
+            ids = strng.to_text(newpacket.Payload).split('\n')
         filescount = 0
         dirscount = 0
         lg.warn('going to erase files: %s' % ids)

transport/proxy/proxy_receiver.py

@@ -751,7 +751,8 @@ def _on_request_service_ack(self, response, info):
             lg.warn('%s was not found in pending requests: %s' % (response.PacketID, self.request_service_packet_id))
         if _Debug:
             lg.out(_DebugLevel, 'proxy_receiver._on_request_service_ack : %s' % str(response.Payload))
-        if not response.Payload.startswith('rejected'):
+        service_ack_info = strng.to_text(response.Payload)
+        if not service_ack_info.startswith('rejected'):
             self.automat('service-accepted', (response, info))
         else:
             self.automat('service-refused', (response, info))