KeyisBClient-mmbp 0.0.0.1.4__tar.gz → 0.0.0.1.8__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 (15) hide show
  1. {keyisbclient_mmbp-0.0.0.1.4 → keyisbclient_mmbp-0.0.0.1.8}/KeyisBClient_mmbp/KeyisBClient_mmbp/Client.py +17 -2
  2. {keyisbclient_mmbp-0.0.0.1.4 → keyisbclient_mmbp-0.0.0.1.8}/KeyisBClient_mmbp/KeyisBClient_mmbp.egg-info/PKG-INFO +7 -5
  3. {keyisbclient_mmbp-0.0.0.1.4 → keyisbclient_mmbp-0.0.0.1.8}/MANIFEST.in +2 -0
  4. {keyisbclient_mmbp-0.0.0.1.4 → keyisbclient_mmbp-0.0.0.1.8}/PKG-INFO +7 -5
  5. {keyisbclient_mmbp-0.0.0.1.4 → keyisbclient_mmbp-0.0.0.1.8}/setup.py +4 -4
  6. {keyisbclient_mmbp-0.0.0.1.4 → keyisbclient_mmbp-0.0.0.1.8}/KeyisBClient_mmbp/KeyisBClient_mmbp/__init__.py +0 -0
  7. {keyisbclient_mmbp-0.0.0.1.4 → keyisbclient_mmbp-0.0.0.1.8}/KeyisBClient_mmbp/KeyisBClient_mmbp/gw_certs/v0.0.1.crt +0 -0
  8. {keyisbclient_mmbp-0.0.0.1.4 → keyisbclient_mmbp-0.0.0.1.8}/KeyisBClient_mmbp/KeyisBClient_mmbp.egg-info/SOURCES.txt +0 -0
  9. {keyisbclient_mmbp-0.0.0.1.4 → keyisbclient_mmbp-0.0.0.1.8}/KeyisBClient_mmbp/KeyisBClient_mmbp.egg-info/dependency_links.txt +0 -0
  10. {keyisbclient_mmbp-0.0.0.1.4 → keyisbclient_mmbp-0.0.0.1.8}/KeyisBClient_mmbp/KeyisBClient_mmbp.egg-info/requires.txt +0 -0
  11. {keyisbclient_mmbp-0.0.0.1.4 → keyisbclient_mmbp-0.0.0.1.8}/KeyisBClient_mmbp/KeyisBClient_mmbp.egg-info/top_level.txt +0 -0
  12. {keyisbclient_mmbp-0.0.0.1.4 → keyisbclient_mmbp-0.0.0.1.8}/KeyisBClient_mmbp/LICENSE +0 -0
  13. {keyisbclient_mmbp-0.0.0.1.4 → keyisbclient_mmbp-0.0.0.1.8}/KeyisBClient_mmbp/mmbConfig.json +0 -0
  14. {keyisbclient_mmbp-0.0.0.1.4 → keyisbclient_mmbp-0.0.0.1.8}/LICENSE +0 -0
  15. {keyisbclient_mmbp-0.0.0.1.4 → keyisbclient_mmbp-0.0.0.1.8}/setup.cfg +0 -0
@@ -45,12 +45,16 @@ class Client:
45
45
  timeout=request.timeout,
46
46
  extensions=request.extensions
47
47
  )
48
+ try:
49
+ json = response.json()
50
+ except:
51
+ json = None
48
52
  return Response(
49
53
  status_code=response.status_code,
50
54
  headers=response.headers,
51
55
  content=response.content,
52
56
  text=response.text,
53
- json=response.json(),
57
+ json=json,
54
58
  stream=response.aiter_bytes(),
55
59
  request=request,
56
60
  extensions=response.extensions,
@@ -71,6 +75,13 @@ class Client:
71
75
  raise Exceptions.UnexpectedError(message=f"Неожиданная ошибка запроса HTTPS: {str(e)}")
72
76
 
73
77
  def requestSync(self, request: Request) -> Response:
78
+ if request.dnsObject.host() is None:
79
+ logging.debug("No DNS record found")
80
+ raise Exceptions.DNS.InvalidDNSError()
81
+
82
+ request.url.hostname = request.dnsObject.host() # type: ignore
83
+ request.url.scheme = request.dnsObject.protocolInfo()['connection_protocol']
84
+
74
85
  try:
75
86
 
76
87
  response = self.__httpClient.request(
@@ -88,12 +99,16 @@ class Client:
88
99
  timeout=request.timeout,
89
100
  extensions=request.extensions
90
101
  )
102
+ try:
103
+ json = response.json()
104
+ except:
105
+ json = None
91
106
  return Response(
92
107
  status_code=response.status_code,
93
108
  headers=response.headers,
94
109
  content=response.content,
95
110
  text=response.text,
96
- json=response.json(),
111
+ json=json,
97
112
  stream=response.aiter_bytes(),
98
113
  request=request,
99
114
  extensions=response.extensions,
@@ -1,15 +1,17 @@
1
1
  Metadata-Version: 2.1
2
- Name: KeyisBClient-mmbp
3
- Version: 0.0.0.1.4
4
- Summary: KeyisBClient-mmbp
5
- Home-page: https://github.com/KeyisB/libs/tree/main/KeyisBClient-mmbp
2
+ Name: KeyisBClient_mmbp
3
+ Version: 0.0.0.1.8
4
+ Summary: KeyisBClient_mmbp
5
+ Home-page: https://github.com/KeyisB/libs/tree/main/KeyisBClient_mmbp
6
6
  Author: KeyisB
7
7
  Author-email: keyisb.pip@gmail.com
8
8
  License: MMB License v1.0
9
9
  Classifier: Programming Language :: Python :: 3
10
10
  Classifier: Operating System :: OS Independent
11
11
  Requires-Python: >=3.12
12
- Description-Content-Type: text/markdown
12
+ Description-Content-Type: text/plain
13
13
  License-File: LICENSE
14
14
  Requires-Dist: KeyisBClient
15
15
  Requires-Dist: httpx
16
+
17
+ GW and MMB Project libraries
@@ -1,2 +1,4 @@
1
1
  graft KeyisBClient_mmbp
2
2
  global-exclude __pycache__ *.py[cod] .DS_Store
3
+ include LICENSE
4
+ include README.md
@@ -1,15 +1,17 @@
1
1
  Metadata-Version: 2.1
2
- Name: KeyisBClient-mmbp
3
- Version: 0.0.0.1.4
4
- Summary: KeyisBClient-mmbp
5
- Home-page: https://github.com/KeyisB/libs/tree/main/KeyisBClient-mmbp
2
+ Name: KeyisBClient_mmbp
3
+ Version: 0.0.0.1.8
4
+ Summary: KeyisBClient_mmbp
5
+ Home-page: https://github.com/KeyisB/libs/tree/main/KeyisBClient_mmbp
6
6
  Author: KeyisB
7
7
  Author-email: keyisb.pip@gmail.com
8
8
  License: MMB License v1.0
9
9
  Classifier: Programming Language :: Python :: 3
10
10
  Classifier: Operating System :: OS Independent
11
11
  Requires-Python: >=3.12
12
- Description-Content-Type: text/markdown
12
+ Description-Content-Type: text/plain
13
13
  License-File: LICENSE
14
14
  Requires-Dist: KeyisBClient
15
15
  Requires-Dist: httpx
16
+
17
+ GW and MMB Project libraries
@@ -1,15 +1,15 @@
1
1
  from setuptools import setup
2
2
 
3
- name = 'KeyisBClient-mmbp'
3
+ name = 'KeyisBClient_mmbp'
4
4
 
5
5
  setup(
6
6
  name=name,
7
- version='0.0.0.1.4',
7
+ version='0.0.0.1.8',
8
8
  author="KeyisB",
9
9
  author_email="keyisb.pip@gmail.com",
10
10
  description=name,
11
- long_description='',
12
- long_description_content_type="text/markdown",
11
+ long_description = 'GW and MMB Project libraries',
12
+ long_description_content_type= 'text/plain',
13
13
  url=f"https://github.com/KeyisB/libs/tree/main/{name}",
14
14
  include_package_data=True,
15
15
  package_dir={'': f'{name}'.replace('-','_')},