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

Commits:

5 changed files:

Changes:

  • nbxmpp/idlequeue.py
    ... ... @@ -86,25 +86,21 @@ class IdleObject:
    86 86
             """
    
    87 87
             Called on stream failure
    
    88 88
             """
    
    89
    -        pass
    
    90 89
     
    
    91 90
         def pollin(self):
    
    92 91
             """
    
    93 92
             Called on new read event
    
    94 93
             """
    
    95
    -        pass
    
    96 94
     
    
    97 95
         def pollout(self):
    
    98 96
             """
    
    99 97
             Called on new write event (connect in sockets is a pollout)
    
    100 98
             """
    
    101
    -        pass
    
    102 99
     
    
    103 100
         def read_timeout(self):
    
    104 101
             """
    
    105 102
             Called when timeout happened
    
    106 103
             """
    
    107
    -        pass
    
    108 104
     
    
    109 105
     
    
    110 106
     class IdleCommand(IdleObject):
    

  • nbxmpp/old_dispatcher.py
    ... ... @@ -458,7 +458,6 @@ class XMPPDispatcher(PlugIn):
    458 458
                         log.warning(
    
    459 459
                             'Unregister failed: %s for "%s" type->%s ns->%s(%s)',
    
    460 460
                             handler, name, typ, ns, xmlns)
    
    461
    -                    pass
    
    462 461
     
    
    463 462
         def RegisterDefaultHandler(self, handler):
    
    464 463
             """
    

  • nbxmpp/protocol.py
    ... ... @@ -592,13 +592,11 @@ class NodeProcessed(Exception):
    592 592
         Exception that should be raised by handler when the handling should be
    
    593 593
         stopped
    
    594 594
         """
    
    595
    -    pass
    
    596 595
     
    
    597 596
     class StreamError(Exception):
    
    598 597
         """
    
    599 598
         Base exception class for stream errors
    
    600 599
         """
    
    601
    -    pass
    
    602 600
     
    
    603 601
     class BadFormat(StreamError):
    
    604 602
         pass
    
    ... ... @@ -2209,4 +2207,3 @@ class DataForm(Node):
    2209 2207
             Simple dictionary interface for setting datafields values by their names
    
    2210 2208
             """
    
    2211 2209
             return self.setField(name).setValue(val)
    2212
    -

  • nbxmpp/simplexml.py
    ... ... @@ -93,7 +93,7 @@ class Node:
    93 93
             self.nsp_cache = {}
    
    94 94
             if nsp:
    
    95 95
                 for k, v in nsp.items(): self.nsp_cache[k] = v
    
    96
    -           
    
    96
    +
    
    97 97
             if attrs is not None:
    
    98 98
                 for attr, val in attrs.items():
    
    99 99
                     if attr == 'xmlns':
    
    ... ... @@ -688,7 +688,6 @@ class NodeBuilder:
    688 688
             up with the built node as argument. Can be redefined to convert incoming
    
    689 689
             XML stanzas to program events
    
    690 690
             """
    
    691
    -        pass
    
    692 691
     
    
    693 692
         def stream_header_received(self):
    
    694 693
             """
    
    ... ... @@ -706,7 +705,7 @@ class NodeBuilder:
    706 705
             """
    
    707 706
             Return True if at least one end tag was seen (at level)
    
    708 707
             """
    
    709
    -        return self.__depth <= level and self.__max_depth > level
    
    708
    +        return self.__depth <= level < self.__max_depth
    
    710 709
     
    
    711 710
         def _inc_depth(self):
    
    712 711
             self.__last_depth = self.__depth
    

  • nbxmpp/stringprepare.py
    ... ... @@ -35,7 +35,6 @@ class ILookupTable:
    35 35
             """
    
    36 36
             Return whether character is in this table
    
    37 37
             """
    
    38
    -        pass
    
    39 38
     
    
    40 39
     
    
    41 40
     class IMappingTable:
    
    ... ... @@ -47,7 +46,6 @@ class IMappingTable:
    47 46
             """
    
    48 47
             Return mapping for character
    
    49 48
             """
    
    50
    -        pass
    
    51 49
     
    
    52 50
     
    
    53 51
     class LookupTableFromFunction: