On branch master

 Changes to be committed:

	modified:   macaddress/__init__.py
	modified:   macaddress/ei48.py
	modified:   macaddress/octet.py
	modified:   setup.py

macaddress/__init__.py

@@ -6,7 +6,7 @@
 
 __author__ = "critical-path"
 
-__version__ = "0.7.0"
+__version__ = "0.8.0"
 
 __all__ = [
     "ExtendedIdentifier48",

macaddress/ei48.py

@@ -9,6 +9,15 @@
 from macaddress.octet import Octet
 
 
+PLAIN = re.compile("^[0-9A-Fa-f]{12}$")
+HYPHEN = re.compile("^([0-9A-Fa-f]{2}[-]{1}){5}[0-9A-Fa-f]{2}$")
+COLON = re.compile("^([0-9A-Fa-f]{2}[:]{1}){5}[0-9A-Fa-f]{2}$")
+DOT = re.compile("^([0-9A-Fa-f]{4}[.]{1}){2}[0-9A-Fa-f]{4}$")
+NOT_DIGITS = re.compile("[^0-9A-Fa-f]")
+TWO_DIGITS = re.compile("[0-9a-f]{2}")
+FOUR_DIGITS = re.compile("[0-9a-f]{4}")
+
+
 class IdentifierError(Exception):
     """
     ExtendedIdentifier48 raises IdentifierError if instantiated
@@ -129,34 +138,27 @@ def is_valid(self):
         # It must contain 12 hexadecimal digits, and it may
         # be in plain, hyphen, colon, or dot notation.
 
-        plain = re.compile("^[0-9A-Fa-f]{12}$")
-        hyphen = re.compile("^([0-9A-Fa-f]{2}[-]{1}){5}[0-9A-Fa-f]{2}$")
-        colon = re.compile("^([0-9A-Fa-f]{2}[:]{1}){5}[0-9A-Fa-f]{2}$")
-        dot = re.compile("^([0-9A-Fa-f]{4}[.]{1}){2}[0-9A-Fa-f]{4}$")
-
-        if plain.match(self.original):
+        if PLAIN.match(self.original):
             return True
-        elif hyphen.match(self.original):
+        elif HYPHEN.match(self.original):
             return True
-        elif colon.match(self.original):
+        elif COLON.match(self.original):
             return True
-        elif dot.match(self.original):
+        elif DOT.match(self.original):
             return True
         else:
             return False
 
     @property
     def normalized(self):
-        pattern = re.compile("[^0-9A-Fa-f]")
-        return pattern.sub("", self.original.lower())
+        return NOT_DIGITS.sub("", self.original.lower())
 
     @property
     def octets(self):
         # Create one instance of Octet for each of the
         # hexadecimal identifier's six octets.
 
-        pattern = re.compile("[0-9a-f]{2}")
-        matches = pattern.findall(self.normalized)
+        matches = TWO_DIGITS.findall(self.normalized)
         return [Octet(match) for match in matches]
 
     @property
@@ -254,8 +256,7 @@ def to_hyphen_notation(self):
         (for example, `a0-b1-c2-d3-e4-f5`).
         """
 
-        pattern = re.compile("[0-9a-f]{2}")
-        matches = pattern.findall(self.normalized)
+        matches = TWO_DIGITS.findall(self.normalized)
         return "-".join(matches)
 
     def to_colon_notation(self):
@@ -264,8 +265,7 @@ def to_colon_notation(self):
         (for example, `a0:b1:c2:d3:e4:f5`).
         """
 
-        pattern = re.compile("[0-9a-f]{2}")
-        matches = pattern.findall(self.normalized)
+        matches = TWO_DIGITS.findall(self.normalized)
         return ":".join(matches)
 
     def to_dot_notation(self):
@@ -274,6 +274,5 @@ def to_dot_notation(self):
         (for example, `a0b1.c2d3.e4f5`).
         """
 
-        pattern = re.compile("[0-9a-f]{4}")
-        matches = pattern.findall(self.normalized)
+        matches = FOUR_DIGITS.findall(self.normalized)
         return ".".join(matches)

macaddress/octet.py

@@ -7,6 +7,9 @@
 import re
 
 
+DIGITS = re.compile("^[0-9A-Fa-f]{2}$")
+
+
 class OctetError(Exception):
     """
     Octet raises OctetError if instantiated with an invalid argument.
@@ -84,9 +87,7 @@ def __str__(self):
     def is_valid(self):
         # Evaluate the hexadecimal digits.
 
-        pattern = re.compile("^[0-9A-Fa-f]{2}$")
-
-        if pattern.match(self.original):
+        if DIGITS.match(self.original):
             return True
         else:
             return False

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name="macaddress",
-    version="0.7.0",
+    version="0.8.0",
     description="The macaddress library makes it easy to work with media access control (MAC) addresses.",
     url="https://github.com/critical-path/macaddress",
     author="critical-path",