Skip to content

Commit

Permalink
Revert "Added importlib.metadata for version check (#233)"
Browse files Browse the repository at this point in the history
This reverts commit ee274ff.
  • Loading branch information
joowani committed Feb 21, 2023
1 parent 7cc99c4 commit 00f6306
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 15 deletions.
20 changes: 6 additions & 14 deletions arango/request.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
__all__ = ["Request"]

from importlib.metadata import version
from typing import Any, MutableMapping, Optional

from arango.typings import DriverFlags, Fields, Headers, Params
Expand All @@ -9,7 +8,12 @@
def normalize_headers(
headers: Optional[Headers], driver_flags: Optional[DriverFlags] = None
) -> Headers:
driver_header = generate_driver_header(driver_flags)
flags = ""
if driver_flags is not None:
for flag in driver_flags:
flags = flags + flag + ";"
driver_version = "7.5.3"
driver_header = "python-arango/" + driver_version + " (" + flags + ")"
normalized_headers: Headers = {
"charset": "utf-8",
"content-type": "application/json",
Expand All @@ -22,18 +26,6 @@ def normalize_headers(
return normalized_headers


def generate_driver_header(driver_flags: Optional[DriverFlags] = None) -> str:
flags: str = ""
if driver_flags is not None:
for flag in driver_flags:
flags = flags + flag + ";"
name: str = "python-arango"
driver_version: str = ".".join(version(name).split(".")[:3]) # Only keep semver
driver_header: str = name + "/" + driver_version + " (" + flags + ")"

return driver_header


def normalize_params(params: Optional[Params]) -> MutableMapping[str, str]:
normalized_params: MutableMapping[str, str] = {}

Expand Down
2 changes: 1 addition & 1 deletion arango/typings.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__all__ = ["Fields", "Headers", "Json", "Jsons", "Params", "DriverFlags"]
__all__ = ["Fields", "Headers", "Json", "Jsons", "Params"]

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

Expand Down

0 comments on commit 00f6306

Please sign in to comment.