ashatora/xmlrpcserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix python 3.8.3

Browse Source
This commit is contained in:
Ivan Vazhenin
2023-10-24 20:00:04 +03:00
parent e0774d5a8e
commit 644f62ee5a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main.py
View File

@@ -71,7 +71,7 @@ def replication_task():
while True: while True:
print() print()
conn = db.connect_db() conn = db.connect_db()
with (Session(conn) as session): with Session(conn) as session:
for bndname in connected: for bndname in connected:
for item in session.query(db.Queue).join(db.Queue.user).filter_by(bndname=bndname).all(): for item in session.query(db.Queue).join(db.Queue.user).filter_by(bndname=bndname).all():
if item.user.is_active_now(): if item.user.is_active_now():

8
reqs/request_xml_service.py
View File

@@ -32,7 +32,7 @@ class RequestXmlService:
result = header.get(attribute_name) result = header.get(attribute_name)
return result.strip() if result else '' return result.strip() if result else ''
def get_request_document(self, request_uuid: str, response_uuid: str | None) -> ET.Element: def get_request_document(self, request_uuid: str, response_uuid) -> ET.Element:
document = ET.Element(self.REQUEST_NODE_NAME) document = ET.Element(self.REQUEST_NODE_NAME)
header = ET.SubElement(document, self.HEADER_NODE_NAME) header = ET.SubElement(document, self.HEADER_NODE_NAME)
header.set(self.REQUEST_ID_ATTRIBUTE_NAME, request_uuid.strip()) header.set(self.REQUEST_ID_ATTRIBUTE_NAME, request_uuid.strip())
@@ -67,7 +67,7 @@ class RequestXmlService:
def get_common_request_xml(self, request_uuid: str) -> ET.Element: def get_common_request_xml(self, request_uuid: str) -> ET.Element:
return self.get_request_document(request_uuid, None) return self.get_request_document(request_uuid, None)
def get_response_xml(self, document: ET.Element, request_uuid: str | None, response_uuid: str, result_code: int, result_message: str) -> ET.Element: def get_response_xml(self, document: ET.Element, request_uuid, response_uuid: str, result_code: int, result_message: str) -> ET.Element:
header = document.find(self.HEADER_NODE_NAME) header = document.find(self.HEADER_NODE_NAME)
header.set(self.REQUEST_ID_ATTRIBUTE_NAME, response_uuid.strip()) header.set(self.REQUEST_ID_ATTRIBUTE_NAME, response_uuid.strip())
header.set(self.RESPONSE_ID_ATTRIBUTE_NAME, request_uuid.strip() if request_uuid else None) header.set(self.RESPONSE_ID_ATTRIBUTE_NAME, request_uuid.strip() if request_uuid else None)
@@ -90,7 +90,7 @@ class RequestXmlService:
raise Exception(Messages.INVALID_REQUEST_DATA) raise Exception(Messages.INVALID_REQUEST_DATA)
self.validate_common_request_xml(document) self.validate_common_request_xml(document)
def validate_common_request_xml(self, document: ET.Element | None): def validate_common_request_xml(self, document):
if not document: if not document:
raise Exception(Messages.NO_REQUEST_DATA_PROVIDED.name) raise Exception(Messages.NO_REQUEST_DATA_PROVIDED.name)
if document.tag != self.REQUEST_NODE_NAME: if document.tag != self.REQUEST_NODE_NAME:
@@ -102,7 +102,7 @@ class RequestXmlService:
if not request_uuid: if not request_uuid:
raise Exception(Messages.MISSING_ATTRIBUTE, self.REQUEST_ID_ATTRIBUTE_NAME, self.HEADER_NODE_NAME) raise Exception(Messages.MISSING_ATTRIBUTE, self.REQUEST_ID_ATTRIBUTE_NAME, self.HEADER_NODE_NAME)
def get_result_code(self, document: ET.Element) -> str | None: def get_result_code(self, document: ET.Element):
result = self.get_element(document, document, self.RESULT_NODE_NAME) result = self.get_element(document, document, self.RESULT_NODE_NAME)
if not result: if not result:
return None return None