/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 DBUS-API

  • Committer: Teddy Hogeborn
  • Date: 2019-08-10 15:19:47 UTC
  • Revision ID: teddy@recompile.se-20190810151947-wyw7cetrh1pvtw37
Simplification of Python 3 compatibility code

Normally, "class Foo:" in Python 2 creates a "classic" class, but in
Python 3, all classes are "new-style" classes, which you can get in
Python 2 by doing "class Foo(object):", i.e. inheriting from "object".
But, you can also get a new-style classes from "class Foo:" in Python
2 by setting the global "__metaclass__" variable to "type", which
makes the code less cluttered.  Note: it is still necessary to inherit
from "object" in Python 2 to get a new-style class if the class is
otherwise inheriting only from "classic" classes.

* mandos: Set "__metaclass__ = type" globally for Python 2, and remove
          inheriting from "object" in all places possible.
* mandos-ctl: - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
55
55
   
56
56
   | Name                    | Type | Access     | clients.conf        |
57
57
   |-------------------------+------+------------+---------------------|
 
58
   | ApprovedByDefault       | b    | Read/Write | approved_by_default |
58
59
   | ApprovalDelay (a)       | t    | Read/Write | approval_delay      |
59
60
   | ApprovalDuration (a)    | t    | Read/Write | approval_duration   |
60
61
   | ApprovalPending (b)     | b    | Read       | N/A                 |
61
 
   | ApprovedByDefault       | b    | Read/Write | approved_by_default |
62
62
   | Checker                 | s    | Read/Write | checker             |
63
63
   | CheckerRunning (c)      | b    | Read/Write | N/A                 |
64
64
   | Created (d)             | s    | Read       | N/A                 |
66
66
   | Expires (f)             | s    | Read       | N/A                 |
67
67
   | ExtendedTimeout (a)     | t    | Read/Write | extended_timeout    |
68
68
   | Fingerprint             | s    | Read       | fingerprint         |
 
69
   | KeyID                   | s    | Read       | key_id              |
69
70
   | Host                    | s    | Read/Write | host                |
70
71
   | Interval (a)            | t    | Read/Write | interval            |
71
 
   | KeyID                   | s    | Read       | key_id              |
72
72
   | LastApprovalRequest (g) | s    | Read       | N/A                 |
73
73
   | LastCheckedOK (h)       | s    | Read/Write | N/A                 |
74
74
   | LastCheckerStatus (i)   | n    | Read       | N/A                 |