Philipp Hörist pushed to branch master at gajim / python-nbxmpp

Commits:

2 changed files:

Changes:

  • .ci/pylint-test.py
    ... ... @@ -32,7 +32,8 @@ def run_pylint_test():
    32 32
         cmd = [
    
    33 33
             'pylint',
    
    34 34
             'nbxmpp',
    
    35
    -        f'--disable={",".join(DISABLED_CHECKS)}'
    
    35
    +        f'--disable={",".join(DISABLED_CHECKS)}',
    
    36
    +        '--ignore=examples'
    
    36 37
         ]
    
    37 38
     
    
    38 39
         try:
    

  • nbxmpp/tcp.py
    ... ... @@ -69,18 +69,22 @@ class TCPConnection(Connection):
    69 69
             if self._con is None:
    
    70 70
                 return None
    
    71 71
     
    
    72
    -        if min_version('GLib', '2.69.0'):
    
    73
    -            tls_con = self._con.get_base_io_stream()
    
    74
    -            return tls_con.get_protocol_version()
    
    72
    +        if not min_version('GLib', '2.69.0'):
    
    73
    +            return None
    
    74
    +
    
    75
    +        tls_con = self._con.get_base_io_stream()
    
    76
    +        return tls_con.get_protocol_version()
    
    75 77
     
    
    76 78
         @property
    
    77 79
         def ciphersuite(self) -> Optional[int]:
    
    78 80
             if self._con is None:
    
    79 81
                 return None
    
    80 82
     
    
    81
    -        if min_version('GLib', '2.69.0'):
    
    82
    -            tls_con = self._con.get_base_io_stream()
    
    83
    -            return tls_con.get_ciphersuite_name()
    
    83
    +        if not min_version('GLib', '2.69.0'):
    
    84
    +            return None
    
    85
    +
    
    86
    +        tls_con = self._con.get_base_io_stream()
    
    87
    +        return tls_con.get_ciphersuite_name()
    
    84 88
     
    
    85 89
         def connect(self):
    
    86 90
             self.state = TCPState.CONNECTING