Merge pull request #233 from lbryio/add-more-pylint

lint the osx and windows apps

lbrynet/conf.py

@@ -198,7 +198,7 @@ class ApplicationSettings(Setting):
         self.ICON_PATH = "icons" if platform is WINDOWS else "app.icns"
         self.APP_NAME = "LBRY"
         self.PROTOCOL_PREFIX = "lbry"
-        self.wallet_TYPES = ["lbryum", "lbrycrd"]
+        self.WALLET_TYPES = ["lbryum", "lbrycrd"]
         self.SOURCE_TYPES = ['lbry_sd_hash', 'url', 'btih']
         self.CURRENCIES = {
             'BTC': {'type': 'crypto'},

lbrynet/lbrynet_daemon/Daemon.py

@@ -1249,7 +1249,7 @@ class Daemon(AuthJSONRPCServer):
         """
 
         log.info("Get daemon settings")
-        return self._render_response(lbrynet_settings.configurable_settings, OK_CODE)
+        return self._render_response(lbrynet_settings.__dict__, OK_CODE)
 
     @AuthJSONRPCServer.auth_required
     def jsonrpc_set_settings(self, p):

packaging/osx/lbry-osx-app/lbrygui/LBRYApp.py

@@ -7,7 +7,6 @@ import platform
 import shutil
 from appdirs import user_data_dir
 from twisted.internet import reactor
-from twisted.web import server
 import Foundation
 bundle = Foundation.NSBundle.mainBundle()
 lbrycrdd_path = bundle.pathForResource_ofType_('lbrycrdd', None)
@@ -22,9 +21,7 @@ if not os.path.isfile(lbrycrdd_path_conf):
     f.write(lbrycrdd_path)
     f.close()
 
-from lbrynet.lbrynet_daemon.DaemonServer import DaemonServer
 from lbrynet.lbrynet_daemon import DaemonControl
-from lbrynet.lbrynet_daemon.DaemonRequest import DaemonRequest
 from lbrynet.conf import settings
 from lbrynet.core import utils
 

packaging/osx/lbry-osx-app/lbrygui/main.py

@@ -15,7 +15,7 @@ log = logging.getLogger()
 
 def main():
     conf.update_settings_from_file()
-    log_file = settings.get_log_filename()
+    log_file = conf.settings.get_log_filename()
     log_support.configure_logging(log_file, console=True)
     app = LBRYDaemonApp.sharedApplication()
     reactor.addSystemEventTrigger("after", "shutdown", AppHelper.stopEventLoop)

packaging/osx/lbry-osx-app/setup_app.sh

@@ -61,6 +61,11 @@ VERSION=`python setup.py -V`
 pip install -r requirements.txt
 # not totally sure if pyOpenSSl is needed (JIE)
 pip install pyOpenSSL
+
+pip install pylint
+pylint -E --disable=inherit-non-class --disable=no-member --ignored-modules=distutils \
+       --enable=unused-import lbrynet packaging/osx/lbry-osx-app/lbrygui/
+
 python setup.py install
 
 echo "Building URI Handler"

packaging/windows/lbry-win32-app/LBRYWin32App.py

@@ -9,7 +9,6 @@ import win32con
 import win32gui_struct
 from jsonrpc.proxy import JSONRPCProxy
 from twisted.internet import reactor, error
-from twisted.web import server
 
 try:
     import winxpgui as win32gui
@@ -20,8 +19,6 @@ from lbrynet import conf
 from lbrynet.core import log_support
 from lbrynet.core import utils
 from lbrynet.lbrynet_daemon import DaemonControl
-from lbrynet.lbrynet_daemon.DaemonServer import DaemonServer
-from lbrynet.lbrynet_daemon.DaemonRequest import DaemonRequest
 from lbrynet.conf import settings
 from packaging.uri_handler.LBRYURIHandler import LBRYURIHandler
 

packaging/windows/test.ps1

@@ -1,4 +1,5 @@
 C:\Python27\Scripts\pip.exe install mock
 C:\Python27\Scripts\pip.exe install pylint
 C:\Python27\python.exe C:\Python27\Scripts\trial.py C:\projects\lbry\tests\unit
+C:\Python27\Scripts\pylint.exe -E --disable=inherit-non-class --disable=no-member --ignored-modules=distutils --enable=unused-import lbrynet packaging/windows/lbry-win32-app/LBRYWin32App.py
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode)  }