From 4d584897d297955ca861ede34bef2fd20ec1fe84 Mon Sep 17 00:00:00 2001 From: Eliseo Martelli Date: Sat, 24 Nov 2018 11:28:34 +0100 Subject: [PATCH 1/2] reordered package --- .gitignore | 2 ++ examples/bluetooth_scan_network.py | 4 ++-- examples/get_alarms.py | 2 +- examples/get_device_info.py | 2 +- examples/reboot.py | 2 +- googledevices/api/__init__.py | 1 + googledevices/{ => api}/alarms.py | 0 googledevices/{ => api}/bluetooth.py | 0 googledevices/{ => api}/device_info.py | 0 googledevices/{ => api}/device_settings.py | 0 10 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 googledevices/api/__init__.py rename googledevices/{ => api}/alarms.py (100%) rename googledevices/{ => api}/bluetooth.py (100%) rename googledevices/{ => api}/device_info.py (100%) rename googledevices/{ => api}/device_settings.py (100%) diff --git a/.gitignore b/.gitignore index 84042d0..98046be 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ pyvenv.cfg dist/ *.egg-info/ __pycache__/ +lib64 +share/ diff --git a/examples/bluetooth_scan_network.py b/examples/bluetooth_scan_network.py index 08e1286..867f16f 100644 --- a/examples/bluetooth_scan_network.py +++ b/examples/bluetooth_scan_network.py @@ -1,9 +1,9 @@ """Example usage of googledevices.""" import asyncio import aiohttp -from googledevices.bluetooth import Bluetooth +from googledevices.api.bluetooth import Bluetooth from googledevices.scan import NetworkScan -from googledevices.device_info import DeviceInfo +from googledevices.api.device_info import DeviceInfo IPRANGE = '192.168.2.0/24' diff --git a/examples/get_alarms.py b/examples/get_alarms.py index 6a0e345..3da5334 100644 --- a/examples/get_alarms.py +++ b/examples/get_alarms.py @@ -1,7 +1,7 @@ """Example usage of googledevices.""" import asyncio import aiohttp -from googledevices.alarms import Alarms +from googledevices.api.alarms import Alarms IPADDRESS = '192.168.2.234' diff --git a/examples/get_device_info.py b/examples/get_device_info.py index e602c17..3dafb6a 100644 --- a/examples/get_device_info.py +++ b/examples/get_device_info.py @@ -1,7 +1,7 @@ """Example usage of googledevices.""" import asyncio import aiohttp -from googledevices.device_info import DeviceInfo +from googledevices.api.device_info import DeviceInfo IPADDRESS = '192.168.2.234' diff --git a/examples/reboot.py b/examples/reboot.py index 5b71255..2725e42 100644 --- a/examples/reboot.py +++ b/examples/reboot.py @@ -1,7 +1,7 @@ """Example usage of googledevices.""" import asyncio import aiohttp -from googledevices.device_settings import DeviceSettings +from googledevices.api.device_settings import DeviceSettings IPADDRESS = '192.168.2.234' diff --git a/googledevices/api/__init__.py b/googledevices/api/__init__.py new file mode 100644 index 0000000..6ae9acc --- /dev/null +++ b/googledevices/api/__init__.py @@ -0,0 +1 @@ +"""Initialize the api.""" diff --git a/googledevices/alarms.py b/googledevices/api/alarms.py similarity index 100% rename from googledevices/alarms.py rename to googledevices/api/alarms.py diff --git a/googledevices/bluetooth.py b/googledevices/api/bluetooth.py similarity index 100% rename from googledevices/bluetooth.py rename to googledevices/api/bluetooth.py diff --git a/googledevices/device_info.py b/googledevices/api/device_info.py similarity index 100% rename from googledevices/device_info.py rename to googledevices/api/device_info.py diff --git a/googledevices/device_settings.py b/googledevices/api/device_settings.py similarity index 100% rename from googledevices/device_settings.py rename to googledevices/api/device_settings.py From 1f133bbc9ca65b38d9e6c2ba2c4d752f071599e6 Mon Sep 17 00:00:00 2001 From: Eliseo Martelli Date: Sat, 24 Nov 2018 11:34:49 +0100 Subject: [PATCH 2/2] fixed examples --- examples/bluetooth_scan_unit.py | 2 +- googledevices/scan.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/bluetooth_scan_unit.py b/examples/bluetooth_scan_unit.py index edbfc73..3e16b6c 100644 --- a/examples/bluetooth_scan_unit.py +++ b/examples/bluetooth_scan_unit.py @@ -1,7 +1,7 @@ """Example usage of googledevices.""" import asyncio import aiohttp -from googledevices.bluetooth import Bluetooth +from googledevices.api.bluetooth import Bluetooth IPADDRESS = '192.168.2.234' diff --git a/googledevices/scan.py b/googledevices/scan.py index 3cc0a9e..59dbb4c 100644 --- a/googledevices/scan.py +++ b/googledevices/scan.py @@ -7,7 +7,7 @@ import socket import ipaddress import logging -from googledevices.device_info import DeviceInfo +from googledevices.api.device_info import DeviceInfo from googledevices.utils.const import PORT _LOGGER = logging.getLogger(__name__)