From 00f6306ac791b2f0038481a2537dc4657fe64f7b Mon Sep 17 00:00:00 2001
From: Joohwan Oh <joohwan.oh@outlook.com>
Date: Tue, 21 Feb 2023 02:15:03 -0800
Subject: [PATCH] Revert "Added importlib.metadata for version check (#233)"
This reverts commit ee274ff67c188d0af0b5c49b170672188f74dba6.
---
arango/request.py | 20 ++++++--------------
arango/typings.py | 2 +-
2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/arango/request.py b/arango/request.py
index b924a80d..d0009f9a 100644
--- a/arango/request.py
+++ b/arango/request.py
@@ -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
@@ -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",
@@ -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] = {}
diff --git a/arango/typings.py b/arango/typings.py
index 91e62685..8d49e3fd 100644
--- a/arango/typings.py
+++ b/arango/typings.py
@@ -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