Merge pull request #37 from piplcom/APPS-1302_update_regex_string

handle regex warning

Author: SaharRefua-Pipl

piplapis/data/fields.py

@@ -91,11 +91,7 @@ def __setattr__(self, attr, value):
             try:
                 self.validate_type(value)
             except ValueError:
-                logger.warn(
-                    "{} is not a valid type of {}. Setting to None.".format(
-                        value, type(self)
-                    )
-                )
+                logger.warn("{} is not a valid type of {}. Setting to None.".format(value, type(self)))
                 value = None
         object.__setattr__(self, attr, value)
 
@@ -108,29 +104,14 @@ def __str__(self):
 
     @property
     def display(self):
-        return (
-            self._display
-            if hasattr(self, "_display") and getattr(self, "_display")
-            else None
-        )
+        return self._display if hasattr(self, "_display") and getattr(self, "_display") else None
 
     def __repr__(self):
         """Return a representation of the object (a valid value for eval())."""
         attrs = list(self.base_attributes + self.attributes + self.children)
-        attrs_values = [
-            (attr, getattr(self, attr))
-            for attr in attrs
-            if not attr.startswith("display")
-        ]
-        attrs_values = [
-            (attr, value) if attr != "type" else ("type_", value)
-            for attr, value in attrs_values
-        ]
-        args = [
-            "%s=%s" % (attr, repr(value))
-            for attr, value in attrs_values
-            if value is not None
-        ]
+        attrs_values = [(attr, getattr(self, attr)) for attr in attrs if not attr.startswith("display")]
+        attrs_values = [(attr, value) if attr != "type" else ("type_", value) for attr, value in attrs_values]
+        args = ["%s=%s" % (attr, repr(value)) for attr, value in attrs_values if value is not None]
         return "%s(%s)" % (self.__class__.__name__, ", ".join(args))
 
     def __eq__(self, other):
@@ -260,9 +241,7 @@ class Name(Field):
 
     attributes = ("type",)
     children = ("prefix", "first", "middle", "last", "suffix", "raw", "display")
-    types_set = set(
-        ["present", "maiden", "former", "alias", "alternative", "autogenerated"]
-    )
+    types_set = set(["present", "maiden", "former", "alias", "alternative", "autogenerated"])
 
     def __init__(
         self,
@@ -444,9 +423,7 @@ class Phone(Field):
         "display",
         "display_international",
     )
-    types_set = set(
-        ["mobile", "home_phone", "home_fax", "work_phone", "work_fax", "pager", "voip"]
-    )
+    types_set = set(["mobile", "home_phone", "home_fax", "work_phone", "work_fax", "pager", "voip"])
 
     def __init__(
         self,
@@ -503,7 +480,7 @@ class Email(Field):
     attributes = ("type", "disposable", "email_provider")
     children = ("address", "address_md5")
     types_set = set(["personal", "work"])
-    re_email = re.compile("^[a-zA-Z0-9'._%\-+]+@[a-zA-Z0-9._%\-]+\.[a-zA-Z]{2,24}$")
+    re_email = re.compile(r"^[a-zA-Z0-9'._%\-+]+@[a-zA-Z0-9._%\-]+\.[a-zA-Z]{2,24}$")
 
     def __init__(
         self,
@@ -658,9 +635,7 @@ def validate_vin_checksum(vin):
         for digit, replacements in replace_map.items():
             for c in replacements:
                 vin = vin.replace(c, digit)
-        checksum = sum(
-            int(num) * positional_weights[i] for i, num in enumerate(vin) if i != 8
-        )
+        checksum = sum(int(num) * positional_weights[i] for i, num in enumerate(vin) if i != 8)
         checksum %= 11
         if checksum == 10:
             checksum = "x"
@@ -706,9 +681,7 @@ class Education(Field):
 
     children = ("degree", "school", "date_range", "display")
 
-    def __init__(
-        self, degree=None, school=None, date_range=None, display=None, *args, **kwargs
-    ):
+    def __init__(self, degree=None, school=None, date_range=None, display=None, *args, **kwargs):
         """`degree` and `school` should both be unicode objects or utf8 encoded
         strs (will be decoded automatically).
 
@@ -744,9 +717,7 @@ def is_valid_url(self):
         """A bool value that indicates whether the image URL is a valid URL."""
         return bool(self.url and is_valid_url(self.url))
 
-    def get_thumbnail_url(
-        self, width=100, height=100, zoom_face=True, favicon=True, use_https=False
-    ):
+    def get_thumbnail_url(self, width=100, height=100, zoom_face=True, favicon=True, use_https=False):
         """
         This method creates a thumbnail URL for this image.
 
@@ -795,24 +766,16 @@ def generate_redundant_thumbnail_url(
         if first_image is None and second_image is None:
             raise ValueError("Please provide at least one image.")
 
-        images_with_tokens = [
-            x for x in (first_image, second_image) if x and x.thumbnail_token
-        ]
+        images_with_tokens = [x for x in (first_image, second_image) if x and x.thumbnail_token]
         if len(images_with_tokens) == 0:
-            raise ValueError(
-                "You can only generate thumbnail URLs for image objects with a thumbnail token."
-            )
+            raise ValueError("You can only generate thumbnail URLs for image objects with a thumbnail token.")
 
         if len(images_with_tokens) == 1:
             tokens = images_with_tokens[0].thumbnail_token
         else:
-            tokens = ",".join(
-                [re.sub("&dsid=\d+", "", x.thumbnail_token) for x in images_with_tokens]
-            )
+            tokens = ",".join([re.sub(r"&dsid=\d+", "", x.thumbnail_token) for x in images_with_tokens])
 
-        thumb_url_base = "{}://thumb.pipl.com/image?".format(
-            "https" if use_https else "http"
-        )
+        thumb_url_base = "{}://thumb.pipl.com/image?".format("https" if use_https else "http")
         params = {
             "height": height,
             "width": width,