↔️ added byteify fn to prevent str >> unicode

🐛 modified prop_names

address trailing whitespace

🔧 flake8 and pylint edits

🚿 pylint edits

Author: Ryan Patrick Kyle

dash/development/_r_components_generation.py

@@ -142,7 +142,7 @@ def generate_class_string(name, props, project_shortname, prefix):
         '\'{}\''.format(p)
         for p in prop_keys
         if '*' not in p and
-        p != 'setProps' + ['**kwargs']
+        p not in ['setProps']
     )
 
     # in R, we set parameters with no defaults to NULL
@@ -161,8 +161,7 @@ def generate_class_string(name, props, project_shortname, prefix):
     # Filter props to remove those we don't want to expose
     for item in prop_keys[:]:
         if item.endswith('-*') \
-                or item in r_keywords \
-                or item == 'setProps':
+                or item in r_keywords + ['setProps']:
             prop_keys.remove(item)
 
     default_argtext += ", ".join(

dash/development/component_generator.py

@@ -65,7 +65,9 @@ def generate_components(components_source, project_shortname,
             file=sys.stderr)
         sys.exit(1)
 
-    metadata = json.loads(out.decode(), object_pairs_hook=OrderedDict)
+    jsondata_unicode = json.loads(out.decode(), object_pairs_hook=OrderedDict)
+    metadata = byteify(jsondata_unicode)
+
     generator_methods = [generate_class_file]
 
     if rprefix:
@@ -89,7 +91,8 @@ def generate_components(components_source, project_shortname,
 
     if rprefix:
         with open('package.json', 'r') as f:
-            pkg_data = json.load(f, object_pairs_hook=OrderedDict)
+            jsondata_unicode = json.load(f, object_pairs_hook=OrderedDict)
+            pkg_data = byteify(jsondata_unicode)
 
         generate_exports(
             project_shortname, components, metadata, pkg_data, prefix
@@ -133,5 +136,16 @@ def cli():
         rprefix=args.r_prefix)
 
 
+def byteify(input_object):
+    if isinstance(input_object, dict):
+        return {byteify(key): byteify(value)
+                for key, value in input_object.iteritems()}
+    elif isinstance(input_object, list):
+        return [byteify(element) for element in input_object]
+    elif isinstance(input_object, unicode):
+        return input_object.encode('utf-8')
+    return input_object
+
+
 if __name__ == '__main__':
     cli()