Merge pull request #148 from orsinium/uppercase-headers-constant

uppercase headers constant
eclecticiq · Feb 7, 2020 · 915fade · 915fade
2 parents 903b149 + dd3c911
commit 915fade
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/opentaxii/taxii/http.py b/opentaxii/taxii/http.py
@@ -31,28 +31,28 @@
     HTTP_CONTENT_TYPE, HTTP_X_TAXII_CONTENT_TYPE,
     HTTP_X_TAXII_PROTOCOL, HTTP_X_TAXII_SERVICES)
 
-TAXII_11_HTTPS_Headers = {
+TAXII_11_HTTPS_HEADERS = {
     HTTP_CONTENT_TYPE: HTTP_CONTENT_XML,
     HTTP_X_TAXII_CONTENT_TYPE: VID_TAXII_XML_11,
     HTTP_X_TAXII_PROTOCOL: VID_TAXII_HTTPS_10,
     HTTP_X_TAXII_SERVICES: VID_TAXII_SERVICES_11
 }
 
-TAXII_11_HTTP_Headers = {
+TAXII_11_HTTP_HEADERS = {
     HTTP_CONTENT_TYPE: HTTP_CONTENT_XML,
     HTTP_X_TAXII_CONTENT_TYPE: VID_TAXII_XML_11,
     HTTP_X_TAXII_PROTOCOL: VID_TAXII_HTTP_10,
     HTTP_X_TAXII_SERVICES: VID_TAXII_SERVICES_11
 }
 
-TAXII_10_HTTPS_Headers = {
+TAXII_10_HTTPS_HEADERS = {
     HTTP_CONTENT_TYPE: HTTP_CONTENT_XML,
     HTTP_X_TAXII_CONTENT_TYPE: VID_TAXII_XML_10,
     HTTP_X_TAXII_PROTOCOL: VID_TAXII_HTTPS_10,
     HTTP_X_TAXII_SERVICES: VID_TAXII_SERVICES_10
 }
 
-TAXII_10_HTTP_Headers = {
+TAXII_10_HTTP_HEADERS = {
     HTTP_CONTENT_TYPE: HTTP_CONTENT_XML,
     HTTP_X_TAXII_CONTENT_TYPE: VID_TAXII_XML_10,
     HTTP_X_TAXII_PROTOCOL: VID_TAXII_HTTP_10,
@@ -69,14 +69,14 @@ def get_http_headers(version, is_secure):
     taxii_11 = [VID_TAXII_XML_11, VID_TAXII_SERVICES_11]
     if version in taxii_11:
         if is_secure:
-            return TAXII_11_HTTPS_Headers
-        return TAXII_11_HTTP_Headers
+            return TAXII_11_HTTPS_HEADERS
+        return TAXII_11_HTTP_HEADERS
 
     taxii_10 = [VID_TAXII_XML_10, VID_TAXII_SERVICES_10]
     if version in taxii_10:
         if is_secure:
-            return TAXII_10_HTTPS_Headers
-        return TAXII_10_HTTP_Headers
+            return TAXII_10_HTTPS_HEADERS
+        return TAXII_10_HTTP_HEADERS
 
     # FIXME: should raise a custom error
     raise ValueError(

diff --git a/tests/utils.py b/tests/utils.py
@@ -3,8 +3,8 @@
 
 from opentaxii.taxii import entities
 from opentaxii.taxii.http import (
-    TAXII_10_HTTPS_Headers, TAXII_10_HTTP_Headers, TAXII_11_HTTPS_Headers,
-    TAXII_11_HTTP_Headers
+    TAXII_10_HTTPS_HEADERS, TAXII_10_HTTP_HEADERS, TAXII_11_HTTPS_HEADERS,
+    TAXII_11_HTTP_HEADERS
 )
 from opentaxii.taxii.http import (
     HTTP_ACCEPT, HTTP_CONTENT_XML)
@@ -28,14 +28,14 @@ def prepare_headers(version, https):
     headers = dict()
     if version == 10:
         if https:
-            headers.update(TAXII_10_HTTPS_Headers)
+            headers.update(TAXII_10_HTTPS_HEADERS)
         else:
-            headers.update(TAXII_10_HTTP_Headers)
+            headers.update(TAXII_10_HTTP_HEADERS)
     elif version == 11:
         if https:
-            headers.update(TAXII_11_HTTPS_Headers)
+            headers.update(TAXII_11_HTTPS_HEADERS)
         else:
-            headers.update(TAXII_11_HTTP_Headers)
+            headers.update(TAXII_11_HTTP_HEADERS)
     else:
         raise ValueError('Unknown TAXII message version: %s' % version)
 
@@ -99,13 +99,13 @@ def includes(superset, subset):
 def is_headers_valid(headers, version, https):
     if version == 10:
         if https:
-            return includes(headers, TAXII_10_HTTPS_Headers)
+            return includes(headers, TAXII_10_HTTPS_HEADERS)
         else:
-            return includes(headers, TAXII_10_HTTP_Headers)
+            return includes(headers, TAXII_10_HTTP_HEADERS)
     elif version == 11:
         if https:
-            return includes(headers, TAXII_11_HTTPS_Headers)
+            return includes(headers, TAXII_11_HTTPS_HEADERS)
         else:
-            return includes(headers, TAXII_11_HTTP_Headers)
+            return includes(headers, TAXII_11_HTTP_HEADERS)
     else:
         raise ValueError('Unknown TAXII message version: %s' % version)