/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-monitor.xml

  • Committer: Teddy Hogeborn
  • Date: 2014-07-25 23:16:04 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 321.
  • Revision ID: teddy@recompile.se-20140725231604-f5c4f82rn2o5ll1k
Use the .items() method instead of .iteritems().

This is strictly not a Python 2.7 change, but Python 2.7 backported
the new .viewitems() from Python 3, and instead of changing .items()
to .viewitems() and later having to change them all into .items()
again in Python 3, I opted to just change all .iteritems() to .items()
so the code will work both now and with Python 3.  The slowdown with
Python 2 is not significant, and with Python 3 it will again be fast.

* mandos (Client.__init__): Use .items() instead of .iteritems().
  (DBusObjectWithProperties.Introspect): - '' -
  (alternate_dbus_interfaces/wrapper): - '' -
  (main): - '' -
* mandos-ctl (main): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor.xml
2
2
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
3
3
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY COMMANDNAME "mandos-monitor">
5
 
<!ENTITY TIMESTAMP "2010-09-14">
 
5
<!ENTITY TIMESTAMP "2014-07-14">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
19
19
        <firstname>Björn</firstname>
20
20
        <surname>Påhlsson</surname>
21
21
        <address>
22
 
          <email>belorn@fukt.bsnet.se</email>
 
22
          <email>belorn@recompile.se</email>
23
23
        </address>
24
24
      </author>
25
25
      <author>
26
26
        <firstname>Teddy</firstname>
27
27
        <surname>Hogeborn</surname>
28
28
        <address>
29
 
          <email>teddy@fukt.bsnet.se</email>
 
29
          <email>teddy@recompile.se</email>
30
30
        </address>
31
31
      </author>
32
32
    </authorgroup>
33
33
    <copyright>
34
34
      <year>2010</year>
 
35
      <year>2011</year>
 
36
      <year>2012</year>
35
37
      <holder>Teddy Hogeborn</holder>
36
38
      <holder>Björn Påhlsson</holder>
37
39
    </copyright>
127
129
        <entry>Toggle log window line wrap</entry>
128
130
      </row>
129
131
      <row>
 
132
        <entry>v</entry>
 
133
        <entry>Toggle verbose logging</entry>
 
134
      </row>
 
135
      <row>
130
136
        <entry>Up, Ctrl-P, k</entry>
131
137
        <entry>Move up a line</entry>
132
138
      </row>
167
173
        <entry>Deny client</entry>
168
174
      </row>
169
175
      <row>
170
 
        <entry>r, _, Ctrl-K</entry>
 
176
        <entry>R, _, Ctrl-K</entry>
171
177
        <entry>Remove client</entry>
172
178
      </row>
173
179
      <row>
218
224
  <refsect1 id="see_also">
219
225
    <title>SEE ALSO</title>
220
226
    <para>
 
227
      <citerefentry><refentrytitle>intro</refentrytitle>
 
228
      <manvolnum>8mandos</manvolnum></citerefentry>,
221
229
      <citerefentry><refentrytitle>mandos</refentrytitle>
222
230
      <manvolnum>8</manvolnum></citerefentry>,
223
231
      <citerefentry><refentrytitle>mandos-ctl</refentrytitle>