/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-ctl

  • Committer: teddy at recompile
  • Date: 2019-12-04 23:46:59 UTC
  • Revision ID: teddy@recompile.se-20191204234659-m4u7bxnjrns6d3fc
Simplification of Python 3 compatibility code

Apply previously-made change in mandos and mandos-ctl also to
mandos-monitor.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
48
48
 
49
49
if sys.version_info.major == 2:
50
50
    __metaclass__ = type
 
51
    str = unicode
51
52
 
52
53
try:
53
54
    import pydbus
75
76
logging.captureWarnings(True)   # Show warnings via the logging system
76
77
 
77
78
if sys.version_info.major == 2:
78
 
    str = unicode
79
79
    import StringIO
80
80
    io.StringIO = StringIO.StringIO
81
81