From c5604ef965513c94430ebcca3fd1111e8cafdee4 Mon Sep 17 00:00:00 2001 From: JustAnotherArchivist Date: Sat, 11 Jul 2020 21:27:48 +0000 Subject: [PATCH] Simplify header merging --- qwarc/__init__.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/qwarc/__init__.py b/qwarc/__init__.py index 22e984a..5a3ced6 100644 --- a/qwarc/__init__.py +++ b/qwarc/__init__.py @@ -52,13 +52,7 @@ class Item: def _merge_headers(self, headers, extraHeaders = []): d = {} # Preserves order from Python 3.7 (guaranteed) or CPython 3.6 (implementation detail) keys = {} # casefolded key -> d key - for key, value in self.headers: - d[key] = value - keys[key.casefold()] = key - for key, value in extraHeaders: - d[key] = value - keys[key.casefold()] = key - for key, value in headers: + for key, value in itertools.chain(self.headers, extraHeaders, headers): keyc = key.casefold() if value is None: if keyc in keys: