Philipp Hörist pushed to branch master at gajim / gajim

Commits:

5 changed files:

Changes:

  • gajim/common/modules/adhoc_commands.py
    ... ... @@ -303,7 +303,7 @@ def _execute_command_received(self, _con, stanza, _properties):
    303 303
             if sessionid is None:
    
    304 304
                 # we start a new command session
    
    305 305
                 # only if we are visible for the jid and command exist
    
    306
    -            if node not in self._commands.keys():
    
    306
    +            if node not in self._commands:
    
    307 307
                     self._con.connection.send(
    
    308 308
                         nbxmpp.Error(
    
    309 309
                             stanza, Namespace.STANZAS + ' item-not-found'))
    

  • gajim/common/socks5.py
    ... ... @@ -85,7 +85,7 @@ def start_listener(self, port, sha_str, sha_handler, file_props,
    85 85
             log.debug('Start listening for socks5 connection')
    
    86 86
             sid = file_props.sid
    
    87 87
             self.sha_handlers[sha_str] = (sha_handler, sid)
    
    88
    -        if self.listener is None or self.listener.connections == []:
    
    88
    +        if self.listener is None or not self.listener.connections:
    
    89 89
                 self.listener = Socks5Listener(self.idlequeue, port, file_props,
    
    90 90
                     fingerprint=fingerprint)
    
    91 91
                 self.listener.queue = self
    

  • gajim/gajim_remote.py
    ... ... @@ -211,7 +211,7 @@ def __init__(self):
    211 211
                     }
    
    212 212
     
    
    213 213
             self.sbus = None
    
    214
    -        if self.argv_len < 2 or sys.argv[1] not in self.commands.keys():
    
    214
    +        if self.argv_len < 2 or sys.argv[1] not in self.commands:
    
    215 215
                 # no args or bad args
    
    216 216
                 send_error(self.compose_help())
    
    217 217
             self.command = sys.argv[1]
    

  • gajim/gtk/controls/base.py
    ... ... @@ -275,15 +275,6 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None:
    275 275
         def _connect_contact_signals(self):
    
    276 276
             raise NotImplementedError
    
    277 277
     
    
    278
    -    def _process_jingle_av_event(self, *args):
    
    279
    -        raise NotImplementedError
    
    280
    -
    
    281
    -    def get_our_nick(self):
    
    282
    -        raise NotImplementedError
    
    283
    -
    
    284
    -    def room_name(self):
    
    285
    -        raise NotImplementedError
    
    286
    -
    
    287 278
         def _get_action(self, name: str) -> Gio.Action:
    
    288 279
             return app.window.lookup_action(f'{name}{self.control_id}')
    
    289 280
     
    

  • pylintrc
    ... ... @@ -146,7 +146,7 @@ ignored-classes=optparse.Values,thread._local,_thread._local,gi.repository.GLib.
    146 146
     # (useful for modules/projects where namespaces are manipulated during runtime
    
    147 147
     # and thus existing member attributes cannot be deduced by static analysis. It
    
    148 148
     # supports qualified module names, as well as Unix pattern matching.
    
    149
    -ignored-modules=gi.repository,gajim.gui
    
    149
    +ignored-modules=gi.repository,gajim.gui,cairo
    
    150 150
     
    
    151 151
     # Show a hint with possible names when a member name was not found. The aspect
    
    152 152
     # of finding the hint is based on edit distance.