A second Enum approach #32 without Metaclass compatible with Python 2 and 3

Author: pgaref

http_request_randomizer/requests/parsers/FreeProxyParser.py

@@ -61,7 +61,7 @@ def create_proxy_object(self, dataset):
             elif field[0] == 'Port':
                 port = field[1].strip()  # String strip()
             elif field[0] == 'Anonymity':
-                anonymity = AnonymityLevel(field[1].strip())  # String strip()
+                anonymity = AnonymityLevel.get(field[1].strip())  # String strip()
             elif field[0] == 'Country':
                 country = field[1].strip()  # String strip()
         return ProxyObject(source=self.id, ip=ip, port=port, anonymity_level=anonymity, country=country)

http_request_randomizer/requests/parsers/ProxyForEuParser.py

@@ -64,7 +64,7 @@ def create_proxy_object(self, dataset):
             elif field[0] == 'Port':
                 port = field[1].strip()  # String strip()
             elif field[0] == 'Anon':
-                anonymity = AnonymityLevel(field[1].strip())  # String strip()
+                anonymity = AnonymityLevel.get(field[1].strip())  # String strip()
             elif field[0] == 'Country':
                 country = field[1].strip()  # String strip()
         return ProxyObject(source=self.id, ip=ip, port=port, anonymity_level=anonymity, country=country)

http_request_randomizer/requests/parsers/RebroWeeblyParser.py

@@ -64,7 +64,7 @@ def create_proxy_object(self, dataset):
         port = dataset.split(":")[1]
         # TODO: Parse extra tables and combine data - Provider seems to be out-of-date
         country = "Unknown"
-        anonymity = AnonymityLevel("unknown")
+        anonymity = AnonymityLevel.get("unknown")
 
         return ProxyObject(source=self.id, ip=ip, port=port, anonymity_level=anonymity, country=country)
 

http_request_randomizer/requests/parsers/SamairProxyParser.py

@@ -90,7 +90,7 @@ def create_proxy_object(self, row):
                     return None
                 port = text.split(":")[1]
             elif td_row.attrs['data-label'] == 'Anonymity Type: ':
-                anonymity = AnonymityLevel(td_row.text.strip())
+                anonymity = AnonymityLevel.get(td_row.text.strip())
             elif td_row.attrs['data-label'] == 'Country: ':
                 country = td_row.text.strip()
         return ProxyObject(source=self.id, ip=ip, port=port, anonymity_level=anonymity, country=country)

http_request_randomizer/requests/proxy/ProxyObject.py

@@ -1,4 +1,4 @@
-from enum import EnumMeta, Enum
+from enum import Enum
 
 
 class ProxyObject(object):
@@ -37,34 +37,48 @@ def to_str(self):
                     self.tunnel)
 
 
-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 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
+    # __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.
     ELITE: The proxy hides the requester's IP address and does not add any proxy-related headers to the request.
     """
-    UNKNOWN = 0  # default
-    TRANSPARENT = 1
-    ANONYMOUS = 2
-    ELITE = 3
+    UNKNOWN = 0   # default
+    TRANSPARENT = 1, 'transparent', 'transparent proxy', 'LOW'
+    ANONYMOUS = 2, 'anonymous', 'anonymous proxy', 'high-anonymous'
+    ELITE = 3, 'elite', 'elite proxy', 'HIGH'
+
+    def __new__(cls, int_value, *value_aliases):
+        obj = object.__new__(cls)
+        obj._value_ = int_value
+        for alias in value_aliases:
+            cls._value2member_map_[alias] = obj
+        return obj
+
+    @classmethod
+    def get(cls, name):
+        try:
+            return cls(name)
+        except ValueError:
+            return cls.UNKNOWN

tests/test_proxyObject.py

@@ -19,27 +19,27 @@ def test_AnonymityLevels(self):
         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('??'))
+        self.assertEqual(AnonymityLevel.UNKNOWN, AnonymityLevel.get('unknown'))
+        self.assertEqual(AnonymityLevel.UNKNOWN, AnonymityLevel.get('none'))
+        self.assertEqual(AnonymityLevel.UNKNOWN, AnonymityLevel.get('bad'))
+        self.assertEqual(AnonymityLevel.UNKNOWN, AnonymityLevel.get(''))
+        self.assertEqual(AnonymityLevel.UNKNOWN, AnonymityLevel.get('*'))
+        self.assertEqual(AnonymityLevel.UNKNOWN, AnonymityLevel.get('??'))
 
     def test_TransparentEnumLevel(self):
-        self.assertEqual(AnonymityLevel.TRANSPARENT, AnonymityLevel('transparent'))
-        self.assertEqual(AnonymityLevel.TRANSPARENT, AnonymityLevel('transparent proxy'))
-        self.assertEqual(AnonymityLevel.TRANSPARENT, AnonymityLevel('LOW'))
+        self.assertEqual(AnonymityLevel.TRANSPARENT, AnonymityLevel.get('transparent'))
+        self.assertEqual(AnonymityLevel.TRANSPARENT, AnonymityLevel.get('transparent proxy'))
+        self.assertEqual(AnonymityLevel.TRANSPARENT, AnonymityLevel.get('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'))
+        self.assertEqual(AnonymityLevel.ANONYMOUS, AnonymityLevel.get('anonymous'))
+        self.assertEqual(AnonymityLevel.ANONYMOUS, AnonymityLevel.get('anonymous proxy'))
+        self.assertEqual(AnonymityLevel.ANONYMOUS, AnonymityLevel.get('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'))
+        self.assertEqual(AnonymityLevel.ELITE, AnonymityLevel.get('elite'))
+        self.assertEqual(AnonymityLevel.ELITE, AnonymityLevel.get('elite proxy'))
+        self.assertEqual(AnonymityLevel.ELITE, AnonymityLevel.get('HIGH'))
 
 
 if __name__ == '__main__':