pyGuardPoint 2.0.4__tar.gz → 2.0.6__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (66) hide show
  1. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/PKG-INFO +1 -1
  2. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/gp_asyncio/_async_guardpoint_accessgroups.py +1 -1
  3. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/gp_asyncio/_async_guardpoint_alarmzones.py +1 -1
  4. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/gp_asyncio/guardpoint_connection_asyncio.py +2 -1
  5. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/guardpoint.py +1 -1
  6. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint.egg-info/PKG-INFO +1 -1
  7. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/setup.py +1 -1
  8. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/LICENSE.txt +0 -0
  9. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/README.rst +0 -0
  10. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/CustomWebsocketTransport.py +0 -0
  11. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/CustomWebsocketTransportOld.py +0 -0
  12. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/__init__.py +0 -0
  13. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/_guardpoint_accessgroups.py +0 -0
  14. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/_guardpoint_alarmstates.py +0 -0
  15. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/_guardpoint_alarmzones.py +0 -0
  16. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/_guardpoint_areas.py +0 -0
  17. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/_guardpoint_cardholders.py +0 -0
  18. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/_guardpoint_cardholdertypes.py +0 -0
  19. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/_guardpoint_cards.py +0 -0
  20. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/_guardpoint_controllers.py +0 -0
  21. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/_guardpoint_customizedfields.py +0 -0
  22. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/_guardpoint_departments.py +0 -0
  23. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/_guardpoint_diagnostic.py +0 -0
  24. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/_guardpoint_events.py +0 -0
  25. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/_guardpoint_genericinformation.py +0 -0
  26. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/_guardpoint_inputs.py +0 -0
  27. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/_guardpoint_manualevents.py +0 -0
  28. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/_guardpoint_ouputs.py +0 -0
  29. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/_guardpoint_personaldetails.py +0 -0
  30. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/_guardpoint_readers.py +0 -0
  31. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/_guardpoint_scheduledmags.py +0 -0
  32. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/_guardpoint_securitygroups.py +0 -0
  33. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/_guardpoint_sites.py +0 -0
  34. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/_odata_filter.py +0 -0
  35. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/_str_match_algo.py +0 -0
  36. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/gp_asyncio/__init__.py +0 -0
  37. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/gp_asyncio/_async_guardpoint_alarmstates.py +0 -0
  38. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/gp_asyncio/_async_guardpoint_areas.py +0 -0
  39. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/gp_asyncio/_async_guardpoint_cardholders.py +0 -0
  40. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/gp_asyncio/_async_guardpoint_cardholdertypes.py +0 -0
  41. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/gp_asyncio/_async_guardpoint_cards.py +0 -0
  42. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/gp_asyncio/_async_guardpoint_controllers.py +0 -0
  43. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/gp_asyncio/_async_guardpoint_customizedfields.py +0 -0
  44. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/gp_asyncio/_async_guardpoint_departments.py +0 -0
  45. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/gp_asyncio/_async_guardpoint_diagnostic.py +0 -0
  46. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/gp_asyncio/_async_guardpoint_events.py +0 -0
  47. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/gp_asyncio/_async_guardpoint_genericinformation.py +0 -0
  48. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/gp_asyncio/_async_guardpoint_manualevents.py +0 -0
  49. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/gp_asyncio/_async_guardpoint_ouputs.py +0 -0
  50. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/gp_asyncio/_async_guardpoint_personaldetails.py +0 -0
  51. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/gp_asyncio/_async_guardpoint_readers.py +0 -0
  52. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/gp_asyncio/_async_guardpoint_scheduledmags.py +0 -0
  53. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/gp_asyncio/_async_guardpoint_securitygroups.py +0 -0
  54. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/gp_asyncio/_async_guardpoint_sites.py +0 -0
  55. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/guardpoint_asyncio.py +0 -0
  56. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/guardpoint_connection.py +0 -0
  57. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/guardpoint_dataclasses.py +0 -0
  58. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/guardpoint_error.py +0 -0
  59. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/guardpoint_threaded.py +0 -0
  60. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint/guardpoint_utils.py +0 -0
  61. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint.egg-info/SOURCES.txt +0 -0
  62. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint.egg-info/dependency_links.txt +0 -0
  63. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint.egg-info/not-zip-safe +0 -0
  64. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint.egg-info/requires.txt +0 -0
  65. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/pyGuardPoint.egg-info/top_level.txt +0 -0
  66. {pyguardpoint-2.0.4 → pyguardpoint-2.0.6}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: pyGuardPoint
3
- Version: 2.0.4
3
+ Version: 2.0.6
4
4
  Summary: Python wrapper for GuardPoint 10 Access Control System
5
5
  Author: John Owen
6
6
  Maintainer-email: sales@sensoraccess.co.uk
@@ -7,7 +7,7 @@ from ..guardpoint_error import GuardPointError, GuardPointUnauthorized
7
7
  class AccessGroupsAPI:
8
8
 
9
9
  async def get_access_groups(self):
10
- url = self.baseurl + "/odata/api_AccessGroups"
10
+ url = "/odata/api_AccessGroups"
11
11
  url_query_params = "?"
12
12
 
13
13
  if self.site_uid is not None:
@@ -9,7 +9,7 @@ class AlarmZonesAPI:
9
9
 
10
10
  async def arm_alarm_zone(self, alarm_zone: AlarmZone, option=AlarmZoneOption.ReturnAlarmZoneToWeeklyProgram):
11
11
  if option == AlarmZoneOption.ReturnAlarmZoneToWeeklyProgram:
12
- url = self.baseurl + "/odata/API_AlarmZones/ReturnAlarmZoneToWeeklyProgram"
12
+ url = "/odata/API_AlarmZones/ReturnAlarmZoneToWeeklyProgram"
13
13
  else:
14
14
  raise GuardPointError(f"Unsupported Arming Option")
15
15
 
@@ -204,7 +204,8 @@ class GuardPointConnection:
204
204
  headers['Authorization'] = auth_str
205
205
 
206
206
  log.debug(f"Request data: host={self.baseurl}, {method}, {url}, {headers}, {raw_body}")
207
- url = self.baseurl + url
207
+ if 'http' not in url:
208
+ url = self.baseurl + url
208
209
 
209
210
  if method.lower() == "get":
210
211
  try:
@@ -44,7 +44,7 @@ def stop_listening(client: SignalRClient):
44
44
  class GuardPoint(GuardPointConnection, CardsAPI, CardholdersAPI, AreasAPI, SecurityGroupsAPI, CustomizedFieldsAPI,
45
45
  PersonalDetailsAPI, ScheduledMagsAPI, CardholderTypesAPI, OutputsAPI, DiagnosticAPI, ReadersAPI,
46
46
  ControllersAPI, AlarmStatesAPI, EventsAPI, DepartmentsAPI, SitesAPI, AccessGroupsAPI, GenericInfoAPI,
47
- AlarmZonesAPI, InputsAPI, ManualEventsAPI, AccessGroupsAPI):
47
+ AlarmZonesAPI, InputsAPI, ManualEventsAPI):
48
48
  """
49
49
  A class to interface with the GuardPoint system, providing various APIs for managing cards, cardholders, areas,
50
50
  security groups, customized fields, personal details, scheduled mags, cardholder types, outputs, diagnostics,
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: pyGuardPoint
3
- Version: 2.0.4
3
+ Version: 2.0.6
4
4
  Summary: Python wrapper for GuardPoint 10 Access Control System
5
5
  Author: John Owen
6
6
  Maintainer-email: sales@sensoraccess.co.uk
@@ -5,7 +5,7 @@ long_description = open('README.rst').read()
5
5
  setup(name="pyGuardPoint",
6
6
  python_requires='>3.9.0',
7
7
  packages=find_packages(),
8
- version="2.0.4",
8
+ version="2.0.6",
9
9
  author="John Owen",
10
10
  description="Python wrapper for GuardPoint 10 Access Control System",
11
11
  long_description_content_type='text/markdown',
File without changes
File without changes
File without changes