Use type unicode for argument location (#1503)

* Use type unicode for argument location

Fix for issue with invalid <lambda> value for location argument, e.g.: invalid <lambda> value: u'Pra\xe7a' when it contains special characters like "ç".

* Parse location for both command line and json

Will now correctly parse location both from command line and JSON file.

* Better naming for function to parse unicode str

pokecli.py

@@ -151,7 +151,7 @@ def init_config():
         short_flag="-l",
         long_flag="--location",
         help="Location",
-        type=lambda s: not isinstance(s, unicode) and unicode(s, 'utf8') or str(s),
+        type=parse_unicode_str,
         default=''
     )
     add_config(
@@ -351,6 +351,12 @@ def add_config(parser, json_config, short_flag=None, long_flag=None, **kwargs):
     else:
         args = (long_flag,)
     parser.add_argument(*args, **kwargs)
+
+def parse_unicode_str(string):
+    try:
+        return string.decode('utf8')
+    except UnicodeEncodeError:
+        return string
 
 
 if __name__ == '__main__':