Refactoring URIVariable

Split part of URIVariable.__init__ into post_parse

1 files changed, 23 insertions, 16 deletions

diff --git a/uritemplate/template.py b/uritemplate/template.py
index cc7382b..518878b 100644
--- a/uritemplate/template.py
+++ b/uritemplate/template.py
@@ -155,22 +155,7 @@ class URIVariable(object):
         self.defaults = {}
         # Parse the variable itself.
         self.parse()
-
-        self.start = self.join_str = self.operator
-        if self.operator == '+':
-            self.start = ''
-        if self.operator in ('+', '#', ''):
-            self.join_str = ','
-        if self.operator == '#':
-            self.start = '#'
-        if self.operator == '?':
-            self.start = '?'
-            self.join_str = '&'
-        if self.operator == '&':
-            self.start = self.join_str = '&'
-
-        if self.operator in ('+', '#'):
-            self.safe = URIVariable.reserved
+        self.post_parse()
 
     def __repr__(self):
         return 'URIVariable(%s)' % self
@@ -223,6 +208,28 @@ class URIVariable(object):
 
         self.variable_names = [name for (name, _) in self.variables]
 
+    def post_parse(self):
+        """Set ``start``, ``join_str`` and ``safe`` attributes.
+
+        After parsing the variable, we need to set up these attributes and it
+        only makes sense to do it in a more easily testable way.
+        """
+        self.start = self.join_str = self.operator
+        if self.operator == '+':
+            self.start = ''
+        if self.operator in ('+', '#', ''):
+            self.join_str = ','
+        if self.operator == '#':
+            self.start = '#'
+        if self.operator == '?':
+            self.start = '?'
+            self.join_str = '&'
+        if self.operator == '&':
+            self.start = self.join_str = '&'
+
+        if self.operator in ('+', '#'):
+            self.safe = URIVariable.reserved
+
     def _query_expansion(self, name, value, explode, prefix):
         """Expansion method for the '?' and '&' operators."""
         if value is None or (len(value) == 0 and value != ""):