Using simple enum instead of multi-enum to address #32. Taking advantage of enum metaclass to support multiple value aliases per Enum.

TestCase provided shows that unknown Anonymity type values default to UNKNOWN

Author: pgaref

.travis.yml

@@ -4,7 +4,7 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
-#  - "3.6" Currently not suported by enum34_custom need to customize
+  - "3.6"
 sudo: false
 before_install:
   - python --version

http_request_randomizer/requests/proxy/ProxyObject.py

@@ -1,4 +1,4 @@
-from enum_custom import MultiValueEnum
+from enum import EnumMeta, Enum
 
 
 class ProxyObject(object):
@@ -37,16 +37,34 @@ def to_str(self):
                     self.tunnel)
 
 
-class AnonymityLevel(MultiValueEnum):
+class AnonymityEnumMeta(EnumMeta):
+    def __call__(cls, value, *args, **kw):
+        if isinstance(value, str):
+            # map string Alias to enum values, defaults to Unknown
+            value = {
+                'transparent': 1,
+                'transparent proxy': 1,
+                'LOW': 1,
+                'anonymous': 2,
+                'anonymous proxy': 2,
+                'high-anonymous': 2,
+                'elite': 3,
+                'elite proxy': 3,
+                'HIGH': 3
+            }.get(value, 0)
+        return super(AnonymityEnumMeta, cls).__call__(value, *args, **kw)
+
+
+class AnonymityLevel(Enum):
+    __metaclass__ = AnonymityEnumMeta
     """
+    UNKNOWN: The proxy anonymity capabilities are not exposed
     TRANSPARENT: The proxy does not hide the requester's IP address.
-    ANONYMOUS: The proxy hides the requester's IP address, but adds headers to the forwarded request that make it clear that the request was made using a proxy.
+    ANONYMOUS: The proxy hides the requester's IP address, but adds headers to the forwarded request that make it clear
+        that the request was made using a proxy.
     ELITE: The proxy hides the requester's IP address and does not add any proxy-related headers to the request.
-    UNKNOWN: The proxy anonymity capabilities are not exposed
     """
-    TRANSPARENT = 'transparent', 'transparent proxy', 'LOW'
-    ANONYMOUS = 'anonymous', 'anonymous proxy', 'high-anonymous'
-    ELITE = 'elite', 'elite proxy', 'HIGH'
-    UNKNOWN = 'unknown', 'none'
-    # TODO @pgaref: use a default case instead!!!
-    BAD = "bad", "bad1"
+    UNKNOWN = 0  # default
+    TRANSPARENT = 1
+    ANONYMOUS = 2
+    ELITE = 3

requirements.txt

@@ -7,5 +7,4 @@ pytest-cov == 2.5.1
 python-dateutil == 2.6.1
 requests == 2.18.1
 schedule == 0.4.3
-pyOpenSSL == 17.1.0
-enum34-custom == 0.7.2
+pyOpenSSL == 17.1.0

tests/test_proxyObject.py

@@ -0,0 +1,46 @@
+from __future__ import absolute_import
+
+import unittest
+import sys
+import os
+
+sys.path.insert(0, os.path.abspath('.'))
+
+from http_request_randomizer.requests.proxy.ProxyObject import AnonymityLevel
+
+
+class TestProxyObject(unittest.TestCase):
+
+    def test_AnonymityLevels(self):
+        self.assertTrue(AnonymityLevel.UNKNOWN.value == 0)
+        self.assertTrue(AnonymityLevel.TRANSPARENT.value == 1)
+        self.assertTrue(AnonymityLevel.ANONYMOUS.value == 2)
+        self.assertTrue(AnonymityLevel.ELITE.value == 3)
+        self.assertTrue(len(AnonymityLevel) == 4)  # Enum values
+
+    def test_UnknownEnumLevel(self):
+        self.assertEqual(AnonymityLevel.UNKNOWN, AnonymityLevel('unknown'))
+        self.assertEqual(AnonymityLevel.UNKNOWN, AnonymityLevel('none'))
+        self.assertEqual(AnonymityLevel.UNKNOWN, AnonymityLevel('bad'))
+        self.assertEqual(AnonymityLevel.UNKNOWN, AnonymityLevel(''))
+        self.assertEqual(AnonymityLevel.UNKNOWN, AnonymityLevel('*'))
+        self.assertEqual(AnonymityLevel.UNKNOWN, AnonymityLevel('??'))
+
+    def test_TransparentEnumLevel(self):
+        self.assertEqual(AnonymityLevel.TRANSPARENT, AnonymityLevel('transparent'))
+        self.assertEqual(AnonymityLevel.TRANSPARENT, AnonymityLevel('transparent proxy'))
+        self.assertEqual(AnonymityLevel.TRANSPARENT, AnonymityLevel('LOW'))
+
+    def test_AnonymousEnumLevel(self):
+        self.assertEqual(AnonymityLevel.ANONYMOUS, AnonymityLevel('anonymous'))
+        self.assertEqual(AnonymityLevel.ANONYMOUS, AnonymityLevel('anonymous proxy'))
+        self.assertEqual(AnonymityLevel.ANONYMOUS, AnonymityLevel('high-anonymous'))
+
+    def test_EliteEnumLevel(self):
+        self.assertEqual(AnonymityLevel.ELITE, AnonymityLevel('elite'))
+        self.assertEqual(AnonymityLevel.ELITE, AnonymityLevel('elite proxy'))
+        self.assertEqual(AnonymityLevel.ELITE, AnonymityLevel('HIGH'))
+
+
+if __name__ == '__main__':
+    unittest.main()