Restore the --vartext code.

Not sure why the code was lost.

Author: chinyeungli

src/attributecode/attrib.py

@@ -38,7 +38,7 @@
     os.path.dirname(os.path.realpath(__file__)), '../../templates', 'default_html.template')
 
 
-def generate(abouts, template=None, variables=None):
+def generate(abouts, template=None, vartext_dict=None):
     """
     Generate an attribution text from an `abouts` list of About objects, a
     `template` template text and a `variables` optional dict of extra
@@ -125,7 +125,7 @@ def generate(abouts, template=None, variables=None):
             license_name_to_license_key=license_name_to_license_key,
             utcnow=utcnow,
             tkversion=__version__,
-            variables=variables
+            vartext_dict=vartext_dict
         )
     except Exception as e:
         lineno = getattr(e, 'lineno', '') or ''
@@ -150,7 +150,7 @@ def check_template(template_string):
         return e.lineno, e.message
 
 
-def generate_from_file(abouts, template_loc=DEFAULT_TEMPLATE_FILE, variables=None):
+def generate_from_file(abouts, template_loc=DEFAULT_TEMPLATE_FILE, vartext_dict=None):
     """
     Generate an attribution text from an `abouts` list of About objects, a
     `template_loc` template file location and a `variables` optional
@@ -163,7 +163,7 @@ def generate_from_file(abouts, template_loc=DEFAULT_TEMPLATE_FILE, variables=Non
     template_loc = add_unc(template_loc)
     with io.open(template_loc, encoding='utf-8') as tplf:
         tpls = tplf.read()
-    return generate(abouts, template=tpls, variables=variables)
+    return generate(abouts, template=tpls, vartext_dict=vartext_dict)
 
 
 def generate_and_save(abouts, output_location, template_loc=None, variables=None):
@@ -186,10 +186,16 @@ def generate_and_save(abouts, output_location, template_loc=None, variables=None
                    str(special_char_in_expression))
             errors.append(Error(ERROR, msg))
 
+    vartext_dict = {}
+    if variables:
+        keys = variables.keys()
+        for k in keys:
+            vartext_dict[k] = (variables[k])[0]
+
     rendering_error, rendered = generate_from_file(
         abouts,
         template_loc=template_loc,
-        variables=variables
+        vartext_dict=vartext_dict
     )
 
     if rendering_error: