From e9b033eae09adbca5ef3b159dbe6249f68fcfcd5 Mon Sep 17 00:00:00 2001
From: Bas Hulsken <bhulsken@hotmail.com>
Date: Wed, 22 Jan 2020 22:49:49 +0100
Subject: [PATCH] Port to Python 3 - Ad-hoc SSID handling

Regression introduced by aa18879e9717dfe2d30f249549e9a43d6dd6da4f, where testing was by virtual machine rather than hardware with a wireless device.
---
 src/jarabe/model/adhoc.py   | 6 +++---
 src/jarabe/model/network.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/jarabe/model/adhoc.py b/src/jarabe/model/adhoc.py
index 6093b9253..de68caf8e 100644
--- a/src/jarabe/model/adhoc.py
+++ b/src/jarabe/model/adhoc.py
@@ -251,13 +251,13 @@ def add_access_point(self, access_point):
         access_point -- Access Point
 
         """
-        if access_point.ssid.endswith(' 1'):
+        if access_point.ssid.endswith(b" 1"):
             self._networks[self._CHANNEL_1] = access_point
             self.emit('members-changed', self._CHANNEL_1, True)
-        elif access_point.ssid.endswith(' 6'):
+        elif access_point.ssid.endswith(b" 6"):
             self._networks[self._CHANNEL_6] = access_point
             self.emit('members-changed', self._CHANNEL_6, True)
-        elif access_point.ssid.endswith('11'):
+        elif access_point.ssid.endswith(b"11"):
             self._networks[self._CHANNEL_11] = access_point
             self.emit('members-changed', self._CHANNEL_11, True)
 
diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py
index 33af2159c..a26b62dd4 100644
--- a/src/jarabe/model/network.py
+++ b/src/jarabe/model/network.py
@@ -364,7 +364,7 @@ def is_sugar_adhoc_network(ssid):
     Return: Boolean
 
     """
-    return ssid.startswith('Ad-hoc Network')
+    return ssid.startswith(b"Ad-hoc Network")
 
 
 class WirelessSecurity(object):