Fixed warnings lgtm

Author: sea5kg

example-of-exported/py3/API.md

@@ -1,8 +1,8 @@
 # SomeClient Python Library 
 
 Automatically generated by wsjcpp-jsonrpc20. 
-* Version: v0.0.2
-* Date: Thu, 17 Sep 2020 05:41:35 GMT
+* Version: v0.0.3
+* Date: Fri, 18 Sep 2020 03:27:31 GMT
 
 Example connect/disconnect:
 ```

example-of-exported/py3/libwsjcppjson20client/SomeClient.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 ### This file was automatically generated by wsjcpp-jsonrpc20
-### Version: v0.0.2
-### Date: Thu, 17 Sep 2020 05:41:35 GMT
+### Version: v0.0.3
+### Date: Fri, 18 Sep 2020 03:27:31 GMT
 
 import asyncio
 import websocket
@@ -13,7 +13,7 @@
 class SomeClient:
     __ws = None
     __url = None
-    __cli_version = 'v0.0.2'
+    __cli_version = 'v0.0.3'
     __loop = None
     __token = None
     __connecting = False
@@ -45,7 +45,7 @@ def hasConnection(self):
     def getToken(self):
         return self.__token
     def setToken(self, token):
-        if self.__token == None:
+        if self.__token is None:
             self.__token = token
         else:
             print('ERROR: Token can be set only once')
@@ -56,10 +56,10 @@ def close(self):
             self.__ws = None
 
     def receiveIncomingMesssages(self):
-        if self.__ws == None:
+        if self.__ws is None:
             return None # TODO has not connection
         while True:
-            if self.__ws == None:
+            if self.__ws is None:
                 return None # TODO has not connection
             ready = select.select([self.__ws], [], [], 1)
             if ready[0]:
@@ -83,7 +83,7 @@ async def __looper(self, messageId):
         max_time = 5*10 # 5 seconds
         counter_time = 0
         while True:
-            if self.__ws == None:
+            if self.__ws is None:
                 return None # TODO has not connection
             for inmsg in self.__incomingMesssages:
                 if inmsg['id'] == messageId:
@@ -130,7 +130,7 @@ def __sendCommand(self, req):
         return result
 
     def preprocessIncomeJson(self, jsonIn):
-        if jsonIn == None:
+        if jsonIn is None:
             return jsonIn
         if jsonIn['method'] == 'auth_logoff' and 'result' in jsonIn:
             self.__token = None
@@ -157,12 +157,12 @@ def auth_login(self, login, password, client_app_name = None, client_app_version
         """
         if not self.hasConnection(): return None
         reqJson = self.generateBaseCommand('auth_login')
-        if login == None: 
+        if login is None: 
             raise Exception('Parameter "login" expected (lib: SomeClient.auth_login)')
         if not isinstance(login, str): 
             raise Exception('Parameter "login" expected datatype "str" (lib: SomeClient.auth_login )')
         reqJson['params']['login'] = login
-        if password == None: 
+        if password is None: 
             raise Exception('Parameter "password" expected (lib: SomeClient.auth_login)')
         if not isinstance(password, str): 
             raise Exception('Parameter "password" expected datatype "str" (lib: SomeClient.auth_login )')
@@ -207,7 +207,7 @@ def auth_token(self, token, client_app_name = None, client_app_version = None):
         """
         if not self.hasConnection(): return None
         reqJson = self.generateBaseCommand('auth_token')
-        if token == None: 
+        if token is None: 
             raise Exception('Parameter "token" expected (lib: SomeClient.auth_token)')
         if not isinstance(token, str): 
             raise Exception('Parameter "token" expected datatype "str" (lib: SomeClient.auth_token )')
@@ -242,7 +242,7 @@ def game_create(self, uuid, cost, public, name = None, age = None, activated = N
         """
         if not self.hasConnection(): return None
         reqJson = self.generateBaseCommand('game_create')
-        if uuid == None: 
+        if uuid is None: 
             raise Exception('Parameter "uuid" expected (lib: SomeClient.game_create)')
         if not isinstance(uuid, str): 
             raise Exception('Parameter "uuid" expected datatype "str" (lib: SomeClient.game_create )')
@@ -251,7 +251,7 @@ def game_create(self, uuid, cost, public, name = None, age = None, activated = N
             if not isinstance(name, str): 
                 raise Exception('Parameter "name" expected datatype "str" (lib: SomeClient.game_create )')
             reqJson['params']['name'] = name
-        if cost == None: 
+        if cost is None: 
             raise Exception('Parameter "cost" expected (lib: SomeClient.game_create)')
         if not isinstance(cost, int): 
             raise Exception('Parameter "cost" expected datatype "int" (lib: SomeClient.game_create )')
@@ -260,7 +260,7 @@ def game_create(self, uuid, cost, public, name = None, age = None, activated = N
             if not isinstance(age, int): 
                 raise Exception('Parameter "age" expected datatype "int" (lib: SomeClient.game_create )')
             reqJson['params']['age'] = age
-        if public == None: 
+        if public is None: 
             raise Exception('Parameter "public" expected (lib: SomeClient.game_create)')
         if not isinstance(public, bool): 
             raise Exception('Parameter "public" expected datatype "bool" (lib: SomeClient.game_create )')

example-of-exported/py3/libwsjcppjson20client/__init__.py

@@ -1 +1 @@
-from .SomeClient import *
+from .SomeClient import SomeClient

example-of-exported/py3/setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name='libwsjcppjson20client',
-    version='v0.0.2',
+    version='v0.0.3',
     packages=['libwsjcppjson20client'],
     install_requires=['websocket-client>=0.56.0', 'requests>=2.21.0'],
     keywords=['wsjcpp-jsonrpc20', 'wsjcpp', 'wsjcpp-jsonrpc20', 'example-python-client'],

src/wsjcpp_jsonrpc20_export_cli_python.cpp

@@ -34,9 +34,9 @@ class PyCodeLine{
 
     ~PyCodeLine() {
         if (m_pParent == NULL) {
-            std::cout << "destruct root \n";
+            // std::cout << "destruct root \n";
         } else {
-            std::cout << "destruct something else [" << m_sLine << "]\n";
+            // std::cout << "destruct something else [" << m_sLine << "]\n";
         }
     }
 
@@ -86,6 +86,7 @@ class PyCodeBuilder {
 
     ~PyCodeBuilder() {
         // std::cout << "destruct something else [" << m_pCurr->getLine() << "]\n";
+        delete m_pCurr;
     }
 
     PyCodeBuilder &add(const std::string &sLine) {
@@ -429,7 +430,7 @@ bool WsjcppJsonRpc20ExportCliPython::exportInitPy() {
     WsjcppLog::info(TAG, "Prepare __init__.py " + sFilename);
     std::ofstream __init__;
     __init__.open (sFilename);
-    __init__ << "from ." << m_sClassName << " import *\n";
+    __init__ << "from ." << m_sClassName << " import " << m_sClassName << "\n";
     WsjcppLog::ok(TAG, "Done: " + sFilename);
     return true;
 }
@@ -534,7 +535,7 @@ bool WsjcppJsonRpc20ExportCliPython::exportClientPy() {
             .add("return self.__token")
             .end()
         .sub("def setToken(self, token):")
-            .sub("if self.__token == None:")
+            .sub("if self.__token is None:")
                 .add("self.__token = token")
                 .end()
             .sub("else:")
@@ -551,11 +552,11 @@ bool WsjcppJsonRpc20ExportCliPython::exportClientPy() {
             .end()
         .add("")
         .sub("def receiveIncomingMesssages(self):")
-            .sub("if self.__ws == None:")
+            .sub("if self.__ws is None:")
                 .add("return None # TODO has not connection")
                 .end()
             .sub("while True:")
-                .sub("if self.__ws == None:")
+                .sub("if self.__ws is None:")
                     .add("return None # TODO has not connection")
                     .end()
                 .add("ready = select.select([self.__ws], [], [], 1)")
@@ -586,7 +587,7 @@ bool WsjcppJsonRpc20ExportCliPython::exportClientPy() {
             .add("max_time = 5*10 # 5 seconds")
             .add("counter_time = 0")
             .sub("while True:")
-                .sub("if self.__ws == None:")
+                .sub("if self.__ws is None:")
                     .add("return None # TODO has not connection")
                     .end()
                 .sub("for inmsg in self.__incomingMesssages:")
@@ -651,7 +652,7 @@ bool WsjcppJsonRpc20ExportCliPython::exportClientPy() {
     // prepare login / logoff
     builder
         .sub("def preprocessIncomeJson(self, jsonIn):")
-            .sub("if jsonIn == None:")
+            .sub("if jsonIn is None:")
                 .add("return jsonIn")
                 .end()
     ;
@@ -746,7 +747,7 @@ bool WsjcppJsonRpc20ExportCliPython::exportClientPy() {
             std::string sParamName = paramDef.getName();
             if (paramDef.isRequired()) {
                 builder
-                .sub("if " + sParamName + " == None: ")
+                .sub("if " + sParamName + " is None: ")
                     .add("raise Exception('Parameter \"" + sParamName + "\" expected (lib: " + m_sClassName + "." + sMethod + ")')")
                     .end();
                 exportCliPythonAddCheckDataTypeOfParam(builder, paramDef, m_sClassName, sMethod);