Skip to content

Commit 00f6306

Browse files
committed
Revert "Added importlib.metadata for version check (#233)"
This reverts commit ee274ff.
1 parent 7cc99c4 commit 00f6306

File tree

2 files changed

+7
-15
lines changed

2 files changed

+7
-15
lines changed

arango/request.py

+6-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
__all__ = ["Request"]
22

3-
from importlib.metadata import version
43
from typing import Any, MutableMapping, Optional
54

65
from arango.typings import DriverFlags, Fields, Headers, Params
@@ -9,7 +8,12 @@
98
def normalize_headers(
109
headers: Optional[Headers], driver_flags: Optional[DriverFlags] = None
1110
) -> Headers:
12-
driver_header = generate_driver_header(driver_flags)
11+
flags = ""
12+
if driver_flags is not None:
13+
for flag in driver_flags:
14+
flags = flags + flag + ";"
15+
driver_version = "7.5.3"
16+
driver_header = "python-arango/" + driver_version + " (" + flags + ")"
1317
normalized_headers: Headers = {
1418
"charset": "utf-8",
1519
"content-type": "application/json",
@@ -22,18 +26,6 @@ def normalize_headers(
2226
return normalized_headers
2327

2428

25-
def generate_driver_header(driver_flags: Optional[DriverFlags] = None) -> str:
26-
flags: str = ""
27-
if driver_flags is not None:
28-
for flag in driver_flags:
29-
flags = flags + flag + ";"
30-
name: str = "python-arango"
31-
driver_version: str = ".".join(version(name).split(".")[:3]) # Only keep semver
32-
driver_header: str = name + "/" + driver_version + " (" + flags + ")"
33-
34-
return driver_header
35-
36-
3729
def normalize_params(params: Optional[Params]) -> MutableMapping[str, str]:
3830
normalized_params: MutableMapping[str, str] = {}
3931

arango/typings.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__all__ = ["Fields", "Headers", "Json", "Jsons", "Params", "DriverFlags"]
1+
__all__ = ["Fields", "Headers", "Json", "Jsons", "Params"]
22

33
from typing import Any, Dict, List, MutableMapping, Sequence, Union
44

0 commit comments

Comments
 (0)