Changeset e37c81


Ignore:
Timestamp:
11/04/2016 06:03:21 PM (9 years ago)
Author:
Calum Lind <calumlind+deluge@gmail.com>
Branches:
2.0.x, develop, master
Children:
1e4189
Parents:
af6b27
git-author:
Calum Lind <calumlind+deluge@gmail.com> (11/04/2016 06:03:08 PM)
git-committer:
Calum Lind <calumlind+deluge@gmail.com> (11/04/2016 06:03:21 PM)
Message:

[Lint] Refactor flake8 noqa's and add msg numbers

From pep8-naming:

  • N802: function name should be lowercase
  • N803: argument name should be lowercase
Location:
deluge
Files:
25 edited

Legend:

Unmodified
Added
Removed

  • deluge/configmanager.py

    raf6b27 re37c81  
    100100
    101101
    102 def ConfigManager(config, defaults=None, file_version=1):  # NOQA
     102def ConfigManager(config, defaults=None, file_version=1):  # NOQA: N802
    103103    return _configmanager.get_config(config, defaults=defaults, file_version=file_version)
    104104

  • deluge/core/rpcserver.py

    raf6b27 re37c81  
    9191
    9292class ServerContextFactory(object):
    93     def getContext(self):  # NOQA
     93    def getContext(self):  # NOQA: N802
    9494        """
    9595        Create an SSL context.
    … …  
    134134            reactor.callLater(0, self.dispatch, *call)
    135135
    136     def sendData(self, data):  # NOQA
     136    def sendData(self, data):  # NOQA: N802
    137137        """
    138138        Sends the data to the client.
    … …  
    150150            raise
    151151
    152     def connectionMade(self):  # NOQA
     152    def connectionMade(self):  # NOQA: N802
    153153        """
    154154        This method is called when a new client connects.
    … …  
    160160        self.factory.authorized_sessions[self.transport.sessionno] = AUTH_LEVEL_NONE
    161161
    162     def connectionLost(self, reason=connectionDone):  # NOQA
     162    def connectionLost(self, reason=connectionDone):  # NOQA: N802
    163163        """
    164164        This method is called when the client is disconnected.

  • deluge/httpdownloader.py

    raf6b27 re37c81  
    5353        client.HTTPDownloader.__init__(self, url, filename, headers=headers, agent=agent)
    5454
    55     def gotStatus(self, version, status, message):  # NOQA
     55    def gotStatus(self, version, status, message):  # NOQA: N802
    5656        self.code = int(status)
    5757        client.HTTPDownloader.gotStatus(self, version, status, message)
    5858
    59     def gotHeaders(self, headers):  # NOQA
     59    def gotHeaders(self, headers):  # NOQA: N802
    6060        if self.code == http.OK:
    6161            if 'content-length' in headers:
    … …  
    9393        return client.HTTPDownloader.gotHeaders(self, headers)
    9494
    95     def pagePart(self, data):  # NOQA
     95    def pagePart(self, data):  # NOQA: N802
    9696        if self.code == http.OK:
    9797            self.current_length += len(data)
    … …  
    103103        return client.HTTPDownloader.pagePart(self, data)
    104104
    105     def pageEnd(self):  # NOQA
     105    def pageEnd(self):  # NOQA: N802
    106106        if self.decoder:
    107107            data = self.decoder.flush()
    … …  
    203203                A custom context factory to add a server name for TLS connections.
    204204                """
    205                 def getContext(self):  # NOQA
     205                def getContext(self):  # NOQA: N802
    206206                    ctx = ssl.ClientContextFactory.getContext(self)
    207207                    ClientTLSOptions(host, ctx)

  • deluge/log.py

    raf6b27 re37c81  
    8282        yield LoggingLoggerClass.exception(self, msg, *args, **kwargs)
    8383
    84     def findCaller(self):  # NOQA
     84    def findCaller(self):  # NOQA: N802
    8585        f = logging.currentframe().f_back
    8686        rv = '(unknown file)', 0, '(unknown function)'

  • deluge/plugins/Blocklist/deluge/plugins/blocklist/decompressers.py

    raf6b27 re37c81  
    1414
    1515
    16 def Zipped(reader):  # NOQA
     16def Zipped(reader):  # NOQA: N802
    1717    """Blocklist reader for zipped blocklists"""
    1818    def open(self):
    … …  
    2929
    3030
    31 def GZipped(reader):  # NOQA
     31def GZipped(reader):  # NOQA: N802
    3232    """Blocklist reader for gzipped blocklists"""
    3333    def open(self):
    … …  
    3737
    3838
    39 def BZipped2(reader):  # NOQA
     39def BZipped2(reader):  # NOQA: N802
    4040    """Blocklist reader for bzipped2 blocklists"""
    4141    def open(self):

  • deluge/plugins/WebUi/deluge/plugins/webui/core.py

    raf6b27 re37c81  
    2121from deluge.core.rpcserver import export
    2222from deluge.plugins.pluginbase import CorePluginBase
     23
     24try:
     25    from deluge.ui.web import server
     26except ImportError:
     27    server = False
    2328
    2429log = logging.getLogger(__name__)
    … …  
    5055    @export
    5156    def got_deluge_web(self):
    52         try:
    53             from deluge.ui.web import server  # noqa pylint: disable=unused-import
    54             return True
    55         except ImportError:
    56             return False
     57        """Status of deluge-web module installation.
     58
     59        Check if deluge.ui.web.server modulge is installed and has been successfully imported.
     60
     61        Returns:
     62            bool: True is deluge-web is installed and available, otherwise False.
     63
     64        """
     65
     66        return bool(server)
    5767
    5868    def start_server(self):
    5969        if not self.server:
    60             try:
    61                 from deluge.ui.web import server
    62             except ImportError:
     70            if not self.got_deluge_web():
    6371                return False
    6472

  • deluge/tests/basetest.py

    raf6b27 re37c81  
    1414
    1515    """
    16     def setUp(self):  # NOQA
     16    def setUp(self):  # NOQA: N803
    1717
    1818        if len(component._ComponentRegistry.components) != 0:
    … …  
    2828        return d.addErrback(on_setup_error)
    2929
    30     def tearDown(self):  # NOQA
     30    def tearDown(self):  # NOQA: N803
    3131        d = maybeDeferred(self.tear_down)
    3232

  • deluge/tests/common.py

    raf6b27 re37c81  
    9898        pass
    9999
    100     def addReader(self, arg):  # NOQA
     100    def addReader(self, arg):  # NOQA: N802
    101101        pass
    102102
    … …  
    124124        self.watchdogs = []
    125125
    126     def connectionMade(self):  # NOQA
     126    def connectionMade(self):  # NOQA: N802
    127127        self.transport.write(self.script)
    128128        self.transport.closeStdin()
    129129
    130     def outConnectionLost(self):  # NOQA
     130    def outConnectionLost(self):  # NOQA: N802
    131131        if not self.logfile:
    132132            return
    … …  
    155155                w.cancel()
    156156
    157     def processEnded(self, status):  # NOQA
     157    def processEnded(self, status):  # NOQA: N802
    158158        self.transport.loseConnection()
    159159        if self.quit_d is None:
    … …  
    184184        return ret
    185185
    186     def outReceived(self, data):  # NOQA
     186    def outReceived(self, data):  # NOQA: N802
    187187        """Process output from stdout"""
    188188        self.log_output += data
    … …  
    192192            print(data, end=' ')
    193193
    194     def errReceived(self, data):  # NOQA
     194    def errReceived(self, data):  # NOQA: N802
    195195        """Process output from stderr"""
    196196        self.log_output += data

  • deluge/tests/test_config.py

    raf6b27 re37c81  
    1515
    1616class ConfigTestCase(unittest.TestCase):
    17     def setUp(self):  # NOQA
     17    def setUp(self):  # NOQA: N803
    1818        self.config_dir = set_tmp_config_dir()
    1919

  • deluge/tests/test_error.py

    raf6b27 re37c81  
    55
    66class ErrorTestCase(unittest.TestCase):
    7     def setUp(self):  # NOQA
     7    def setUp(self):  # NOQA: N803
    88        pass
    99
    10     def tearDown(self):  # NOQA
     10    def tearDown(self):  # NOQA: N803
    1111        pass
    1212

  • deluge/tests/test_httpdownloader.py

    raf6b27 re37c81  
    9393        self.putChild('partial', PartialDownloadResource())
    9494
    95     def getChild(self, path, request):  # NOQA
     95    def getChild(self, path, request):  # NOQA: N803
    9696        if path == '':
    9797            return self

  • deluge/tests/test_transfer.py

    raf6b27 re37c81  
    107107class DelugeTransferProtocolTestCase(unittest.TestCase):
    108108
    109     def setUp(self):  # NOQA
     109    def setUp(self):  # NOQA: N803
    110110        """
    111111        The expected messages corresponds to the test messages (msg1, msg2) after they've been processed

  • deluge/tests/test_ui_common.py

    raf6b27 re37c81  
    1616class UICommonTestCase(unittest.TestCase):
    1717
    18     def setUp(self):  # NOQA
     18    def setUp(self):  # NOQA: N803
    1919        pass
    2020
    21     def tearDown(self):  # NOQA
     21    def tearDown(self):  # NOQA: N803
    2222        pass
    2323

  • deluge/tests/test_ui_console_fields.py

    raf6b27 re37c81  
    1515class UICommonTestCase(unittest.TestCase):
    1616
    17     def setUp(self):  # NOQA
     17    def setUp(self):  # NOQA: N803
    1818        self.parent = Parent()
    1919
    20     def tearDown(self):  # NOQA
     20    def tearDown(self):  # NOQA: N803
    2121        pass
    2222

  • deluge/tests/twisted/plugins/delugereporter.py

    raf6b27 re37c81  
    1111    implements(IPlugin, IReporter)
    1212
    13     def __init__(self, name, module, description, longOpt, shortOpt, klass):  # NOQA
     13    def __init__(self, name, module, description, longOpt, shortOpt, klass):  # NOQA: N803
    1414        self.name = name
    1515        self.module = module
    … …  
    3333        TreeReporter.__init__(self, *args, **kwargs)
    3434
    35     def addExpectedFailure(self, *args):  # NOQA
     35    def addExpectedFailure(self, *args):  # NOQA: N802
    3636        # super(TreeReporter, self).addExpectedFailure(*args)
    3737        self.endLine('[TODO]', self.TODO)

  • deluge/transfer.py

    raf6b27 re37c81  
    5757        self.transport.write(compressed)
    5858
    59     def dataReceived(self, data):  # NOQA
     59    def dataReceived(self, data):  # NOQA: N802
    6060        """
    6161        This method is called whenever data is received.

  • deluge/ui/client.py

    raf6b27 re37c81  
    7474class DelugeRPCProtocol(DelugeTransferProtocol):
    7575
    76     def connectionMade(self):  # NOQA
     76    def connectionMade(self):  # NOQA: N802
    7777        self.__rpc_requests = {}
    7878        # Set the protocol in the daemon so it can send data
    … …  
    193193        self.event_handlers = event_handlers
    194194
    195     def startedConnecting(self, connector):  # NOQA
     195    def startedConnecting(self, connector):  # NOQA: N802
    196196        log.debug('Connecting to daemon at "%s:%s"...',
    197197                  connector.host, connector.port)
    198198
    199     def clientConnectionFailed(self, connector, reason):  # NOQA
     199    def clientConnectionFailed(self, connector, reason):  # NOQA: N802
    200200        log.debug('Connection to daemon at "%s:%s" failed: %s',
    201201                  connector.host, connector.port, reason.value)
    202202        self.daemon.connect_deferred.errback(reason)
    203203
    204     def clientConnectionLost(self, connector, reason):  # NOQA
     204    def clientConnectionLost(self, connector, reason):  # NOQA: N802
    205205        log.debug('Connection lost to daemon at "%s:%s" reason: %s',
    206206                  connector.host, connector.port, reason.value)

  • deluge/ui/console/cmdline/commands/__init__.py

    raf6b27 re37c81  
    1 from deluge.ui.console.cmdline.command import BaseCommand  # NOQA
     1from deluge.ui.console.cmdline.command import BaseCommand
     2
     3__all__ = ['BaseCommand']

  • deluge/ui/console/modes/basemode.py

    raf6b27 re37c81  
    8787        return 0
    8888
    89     def doRead(self):  # NOQA
     89    def doRead(self):  # NOQA: N802
    9090        """called when input is ready"""
    9191        pass
    9292
    93     def logPrefix(self):  # NOQA
     93    def logPrefix(self):  # NOQA: N802
    9494        return 'CursesClient'
    9595
    … …  
    144144        self.rows, self.cols = rows, cols
    145145
    146     def connectionLost(self, reason):  # NOQA
     146    def connectionLost(self, reason):  # NOQA: N802
    147147        self.close()
    148148
    … …  
    195195        self.stdscr.refresh()
    196196
    197     def doRead(self):  # NOQA
     197    def doRead(self):  # NOQA: N802
    198198        """
    199199        Called when there is data to be read, ie, input from the keyboard.

  • deluge/ui/console/modes/preferences/__init__.py

    raf6b27 re37c81  
    1 from deluge.ui.console.modes.preferences.preferences import Preferences  # NOQA
     1from deluge.ui.console.modes.preferences.preferences import Preferences
     2
     3__all__ = ['Preferences']

  • deluge/ui/console/widgets/__init__.py

    raf6b27 re37c81  
    1 from deluge.ui.console.widgets.inputpane import BaseInputPane  # NOQA
    2 from deluge.ui.console.widgets.statusbars import StatusBars  # NOQA
    3 from deluge.ui.console.widgets.window import BaseWindow  # NOQA
     1from deluge.ui.console.widgets.inputpane import BaseInputPane
     2from deluge.ui.console.widgets.statusbars import StatusBars
     3from deluge.ui.console.widgets.window import BaseWindow
     4
     5__all__ = ['BaseInputPane', 'StatusBars', 'BaseWindow']

  • deluge/ui/gtkui/ipcinterface.py

    raf6b27 re37c81  
    3939        pass
    4040
    41     def dataReceived(self, data):  # NOQA
     41    def dataReceived(self, data):  # NOQA: N802
    4242        config = ConfigManager('gtkui.conf')
    4343        data = rencode.loads(data, decode_utf8=True)
    … …  
    5252        pass
    5353
    54     def connectionMade(self):  # NOQA
     54    def connectionMade(self):  # NOQA: N802
    5555        self.transport.write(rencode.dumps(self.factory.args))
    5656        self.transport.loseConnection()
    5757
    58     def connectionLost(self, reason=connectionDone):  # NOQA
     58    def connectionLost(self, reason=connectionDone):  # NOQA: N802
    5959        reactor.stop()
    6060        self.factory.stop = True
    … …  
    6767        self.stop = False
    6868
    69     def clientConnectionFailed(self, connector, reason):  # NOQA
     69    def clientConnectionFailed(self, connector, reason):  # NOQA: N802
    7070        log.warning('Connection to running instance failed.')
    7171        reactor.stop()

  • deluge/ui/gtkui/preferences.py

    raf6b27 re37c81  
    2525from deluge.ui.gtkui.path_chooser import PathChooser
    2626from deluge.ui.util import lang
     27
     28try:
     29    import appindicator
     30except ImportError:
     31    appindicator = False
    2732
    2833pygtk.require('2.0')
    … …  
    149154        })
    150155
    151         if not deluge.common.osx_check() and not deluge.common.windows_check():
    152             try:
    153                 import appindicator  # noqa pylint: disable=unused-import
    154             except ImportError:
    155                 pass
    156             else:
    157                 self.builder.get_object('alignment_tray_type').set_visible(True)
     156        # Radio buttons to choose between systray and appindicator
     157        self.builder.get_object('alignment_tray_type').set_visible(appindicator)
    158158
    159159        from deluge.ui.gtkui.gtkui import DEFAULT_PREFS

  • deluge/ui/tracker_icons.py

    raf6b27 re37c81  
    2828    PIL_INSTALLED = False
    2929else:
    30     import deluge.ui.Win32IconImagePlugin  # noqa pylint: disable=unused-import, ungrouped-imports
     30    import deluge.ui.Win32IconImagePlugin  # NOQA pylint: disable=unused-import, ungrouped-imports
    3131    PIL_INSTALLED = True
    3232

  • deluge/ui/web/server.py

    raf6b27 re37c81  
    125125class Render(resource.Resource):
    126126
    127     def getChild(self, path, request):  # NOQA
     127    def getChild(self, path, request):  # NOQA: N802
    128128        request.render_file = path
    129129        return self
    … …  
    150150            self.tracker_icons = TrackerIcons()
    151151
    152     def getChild(self, path, request):  # NOQA
     152    def getChild(self, path, request):  # NOQA: N802
    153153        request.tracker_name = path
    154154        return self
    … …  
    173173
    174174class Flag(resource.Resource):
    175     def getChild(self, path, request):  # NOQA
     175    def getChild(self, path, request):  # NOQA: N802
    176176        request.country = path
    177177        return self
    … …  
    212212        self.__paths[path].remove(directory)
    213213
    214     def getChild(self, path, request):  # NOQA
     214    def getChild(self, path, request):  # NOQA: N802
    215215        if hasattr(request, 'lookup_path'):
    216216            request.lookup_path = os.path.join(request.lookup_path, path)
    … …  
    366366        return scripts
    367367
    368     def getChild(self, path, request):  # NOQA
     368    def getChild(self, path, request):  # NOQA: N802
    369369        if hasattr(request, 'lookup_path'):
    370370            request.lookup_path += '/' + path
    … …  
    478478        self.__debug_scripts.remove(script)
    479479
    480     def getChild(self, path, request):  # NOQA
     480    def getChild(self, path, request):  # NOQA: N802
    481481        if path == '':
    482482            return self
    … …  
    484484            return resource.Resource.getChild(self, path, request)
    485485
    486     def getChildWithDefault(self, path, request):  # NOQA
     486    def getChildWithDefault(self, path, request):  # NOQA: N802
    487487        # Calculate the request base
    488488        header = request.getHeader('x-deluge-base')
Note: See TracChangeset for help on using the changeset viewer.