/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-05-31 19:05:32 UTC
  • Revision ID: teddy@recompile.se-20150531190532-pfc7mega72dzzzka
mandos: More Python 3 fixes.

mandos (MandosServer/handle_ipc): Do not use callable().

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
2153
2153
        
2154
2154
        if command == 'getattr':
2155
2155
            attrname = request[1]
2156
 
            if callable(client_object.__getattribute__(attrname)):
 
2156
            if isinstance(client_object.__getattribute__(attrname),
 
2157
                          collections.Callable):
2157
2158
                parent_pipe.send(('function', ))
2158
2159
            else:
2159
2160
                parent_pipe.send((