From 34c1e8ed2eb808afd3c7ab1996c037aa509a3b4c Mon Sep 17 00:00:00 2001
From: Austin Mroczek <austin@mroczek.org>
Date: Sat, 4 Apr 2020 17:05:44 -0700
Subject: [PATCH] Clean up total_connect_user code and various formatting
 fixes.  Bump to 0.55

---
 setup.py                                   |  3 +--
 total_connect_client/TotalConnectClient.py | 15 +++------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/setup.py b/setup.py
index 4db6b26..6b853c5 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 setup(
   name = 'total_connect_client',
   py_modules = ['total_connect_client'],
-  version = '0.54.1',
+  version = '0.55',
   description = 'Interact with Total Connect 2 alarm systems',
   author = 'Craig J. Midwinter',
   author_email = 'craig.j.midwinter@gmail.com',
@@ -12,7 +12,6 @@
   keywords = ['alarm','TotalConnect'],
   package_data = {'': ['data/*.json']},
   install_requires = ['zeep'],
-#  packages=find_packages(exclude=['tests', 'tests.*']),
   packages=['total_connect_client'],
   include_package_data=True, # use MANIFEST.in during install
   zip_safe=False
diff --git a/total_connect_client/TotalConnectClient.py b/total_connect_client/TotalConnectClient.py
index cdb151e..ddbfb41 100644
--- a/total_connect_client/TotalConnectClient.py
+++ b/total_connect_client/TotalConnectClient.py
@@ -71,7 +71,6 @@ def __init__(self, username, password, usercode="-1", auto_bypass_battery=False)
         )
         self._module_flags = None
         self._user = None
-        self._user_info = None
         self.locations = {}
         self.authenticate()
 
@@ -178,7 +177,6 @@ def populate_details(self, response):
         location_data = response["Locations"]["LocationInfoBasic"]
 
         self._module_flags = response["ModuleFlags"]
-        self._user_info = response["UserInfo"]
 
         self._user = total_connect_user(response["UserInfo"])
 
@@ -479,9 +477,7 @@ def __str__(self):
         )
 
     def set_zone_details(self, zone_status):
-        """Set status based on GetZonesListInStateEx_V1.  
-           Return true if successful.
-           """
+        """Update from GetZonesListInStateEx_V1. Return true if successful."""
         zones = zone_status.get("Zones")
         if zones is None:
             return False
@@ -499,9 +495,7 @@ def set_zone_details(self, zone_status):
         return True
 
     def set_status(self, data):
-        """Update status based on a 'PanelMetadataAndStatus'.
-           Return true if successful.
-           """
+        """Update from 'PanelMetadataAndStatus'. Return true on success."""
         self.ac_loss = data.get("IsInACLoss")
         self.low_battery = data.get("IsInLowBattery")
         self.cover_tampered = data.get("IsCoverTampered")
@@ -700,10 +694,7 @@ class total_connect_user:
     """User for Total Connect."""
 
     def __init__(self, user_info):
-        """Initialize based on UserInfo.
-           Returned from LoginAndGetSessionDetails.
-        """
-
+        """Initialize based on UserInfo from LoginAndGetSessionDetails."""
         self._user_id = user_info["UserID"]
         self._username = user_info["Username"]