All: python3 support changes

emlid · Jan 9, 2017 · 8a01743 · 8a01743
1 parent aa537a8
commit 8a01743
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/tests/fakewifi.py b/tests/fakewifi.py
@@ -23,7 +23,7 @@
 
 import os
 from sysdmanager import SystemdManager
-from .configs import wificontrol, wpas, hotspot, wifi
+from configs import wificontrol, wpas, hotspot, wifi
 
 restart_mdns_cmd = "systemctl restart mdns.service && sleep 2"
 rfkill_block_cmd = "rfkill block wifi"

diff --git a/tests/test_hostapd.py b/tests/test_hostapd.py
@@ -26,7 +26,7 @@
 import platform
 import subprocess
 from random import randint
-from .fakewifi import fakeHostAP as HostAP
+from fakewifi import fakeHostAP as HostAP
 
 class HostAPTest(unittest.TestCase):
 

diff --git a/tests/test_wificontrol.py b/tests/test_wificontrol.py
@@ -25,7 +25,7 @@
 import unittest
 import platform
 import subprocess
-from .fakewifi import fakeWiFiControl as WiFiControl
+from fakewifi import fakeWiFiControl as WiFiControl
 
 class WiFiControlTest(unittest.TestCase):
 

diff --git a/tests/test_wpas.py b/tests/test_wpas.py
@@ -26,7 +26,7 @@
 import platform
 import subprocess
 from random import randint
-from .fakewifi import fakeWpaSupplicant as WpaSupplicant 
+from fakewifi import fakeWpaSupplicant as WpaSupplicant 
 
 class ValidationError(Exception):
     pass

diff --git a/wificontrol/hostapd.py b/wificontrol/hostapd.py
@@ -36,7 +36,7 @@ def __init__(self, interface,
         self.hostapd_path = hostapd_config
         self.hostname_path = hostname_config
 
-        if ("bin/hostapd" not in self.execute_command("whereis hostapd")):
+        if (b'bin/hostapd' not in self.execute_command("whereis hostapd")):
             raise OSError('No HOSTAPD servise')
 
         self.started = lambda: self.sysdmanager.is_active("hostapd.service")

diff --git a/wificontrol/utils/fileupdater.py b/wificontrol/utils/fileupdater.py
@@ -123,7 +123,7 @@ def __findNetwork(self, network_aim):
                 return network
 
     def __update_config_file(self):
-        with open(self.__config_file_path, 'w', 0) as config_file:
+        with open(self.__config_file_path, 'w') as config_file:
             config_file.write(self.__create_config_file())
 
     def add_network(self, network):

diff --git a/wificontrol/wpasupplicant.py b/wificontrol/wpasupplicant.py
@@ -41,7 +41,7 @@ def __init__(self, interface,
         self.wpa_supplicant_path = wpas_config
         self.p2p_supplicant_path = p2p_config
 
-        if ("bin/wpa_supplicant" not in self.execute_command("whereis wpa_supplicant")):
+        if (b'bin/wpa_supplicant' not in self.execute_command("whereis wpa_supplicant")):
             raise OSError('No WPA_SUPPLICANT servise')
 
         self.wpa_supplicant_interface = WpaSupplicantInterface(self.interface)