Update classes and fixes dict usage in API (in and out)

Fix #34

Author: Elektordi

.flake8

@@ -1,5 +1,7 @@
 [flake8]
 exclude = build/*
+max-line-length = 100
+ignore = W503
 per-file-ignores =
 	obswebsocket/requests.py: E501 W391 W293
 	obswebsocket/events.py: E501 W391 W293

generate_classes.py

@@ -13,9 +13,7 @@ def clean_var(string):
     Converts a string to a suitable variable name by removing not allowed
     characters.
     """
-    for ch in ['-', '.', '*']:
-        string = string.replace(ch, '_')
-    string = string.replace('[]', '')
+    string = string.replace('-', '_').replace('[]', '')
     return string
 
 
@@ -33,10 +31,8 @@ def generate_classes():
             f.write("#!/usr/bin/env python\n")
             f.write("# -*- coding: utf-8 -*-\n")
             f.write("\n")
-            f.write("# THIS FILE WAS GENERATED BY generate_classes.py - "
-                    "DO NOT EDIT #\n")
-            f.write("# (Generated on {}) #\n".format(
-                datetime.now().isoformat(" ")))
+            f.write("# THIS FILE WAS GENERATED BY generate_classes.py - DO NOT EDIT #\n")
+            f.write("# (Generated on {}) #\n".format(datetime.now().isoformat(" ")))
             f.write("\n")
             f.write("from .base_classes import Base{}\n".format(event))
             f.write("\n\n")
@@ -51,12 +47,10 @@ def generate_classes():
                         if len(i['params']) > 0:
                             f.write("    :Arguments:\n")
                             for a in i['params']:
-                                f.write("       *{}*\n".format(
-                                    clean_var(a['name'])))
-                                f.write("            type: {}\n".format(
-                                    a['type']))
-                                f.write("            {}\n".format(
-                                    a['description']))
+                                a['name'] = a['name'].replace("[]", ".*")
+                                f.write("       *{}*\n".format(clean_var(a['name'])))
+                                f.write("            type: {}\n".format(a['type']))
+                                f.write("            {}\n".format(a['description']))
                                 if 'optional' in a['type']:
                                     arguments_default.append(a['name'])
                                 else:
@@ -69,34 +63,35 @@ def generate_classes():
                         if len(i['returns']) > 0:
                             f.write("    :Returns:\n")
                             for r in i['returns']:
-                                f.write("       *{}*\n".format(
-                                    clean_var(r['name'])))
-                                f.write("            type: {}\n".format(
-                                    r['type']))
-                                f.write("            {}\n".format(
-                                    r['description']))
+                                r['name'] = r['name'].replace("[]", ".*")
+                                f.write("       *{}*\n".format(clean_var(r['name'])))
+                                f.write("            type: {}\n".format(r['type']))
+                                f.write("            {}\n".format(r['description']))
                                 returns.append(r['name'])
                     except KeyError:
                         pass
 
+                    arguments = set([x.split(".")[0] for x in arguments])
+                    arguments_default = set([x.split(".")[0] for x in arguments_default])
+                    arguments_default = set([x for x in arguments_default if x not in arguments])
+                    returns = set([x.split(".")[0] for x in returns])
+
                     f.write("    \"\"\"\n\n")
                     f.write("    def __init__({}):\n".format(
                         ", ".join(
-                            ["self"] +
-                            [clean_var(a) for a in arguments] +
-                            [clean_var(a) + "=None" for a in arguments_default]
+                            ["self"]
+                            + [clean_var(a) for a in arguments]
+                            + [clean_var(a) + "=None" for a in arguments_default]
                         )
                     ))
                     f.write("        Base{}.__init__(self)\n".format(event))
                     f.write("        self.name = '{}'\n".format(i['name']))
                     for r in returns:
                         f.write("        self.datain['{}'] = None\n".format(r))
                     for a in arguments:
-                        f.write("        self.dataout['{}'] = {}\n".format(
-                            a, clean_var(a)))
+                        f.write("        self.dataout['{}'] = {}\n".format(a, clean_var(a)))
                     for a in arguments_default:
-                        f.write("        self.dataout['{}'] = {}\n".format(
-                            a, clean_var(a)))
+                        f.write("        self.dataout['{}'] = {}\n".format(a, clean_var(a)))
                     f.write("\n")
                     for r in returns:
                         cc = "".join(x.capitalize() for x in r.split('-'))