Adjust import order, spacing, operators as recommended by pylint

4 files changed, 21 insertions, 19 deletions

diff --git a/systemd/daemon.py b/systemd/daemon.py
index 5d398f2..625219c 100644
--- a/systemd/daemon.py
+++ b/systemd/daemon.py
@@ -1,3 +1,5 @@
+from socket import AF_UNSPEC as _AF_UNSPEC
+
 from ._daemon import (__version__,
                       booted,
                       notify,
@@ -9,7 +11,6 @@ from ._daemon import (__version__,
                       _is_socket_unix,
                       _is_mq,
                       LISTEN_FDS_START)
-from socket import AF_UNSPEC as _AF_UNSPEC
 
 def _convert_fileobj(fileobj):
     try:
diff --git a/systemd/journal.py b/systemd/journal.py
index 524ca9f..30d1f39 100644
--- a/systemd/journal.py
+++ b/systemd/journal.py
@@ -26,10 +26,11 @@ import uuid as _uuid
 import traceback as _traceback
 import os as _os
 import logging as _logging
-if _sys.version_info >= (3,3):
-    from collections import ChainMap as _ChainMap
 from syslog import (LOG_EMERG, LOG_ALERT, LOG_CRIT, LOG_ERR,
                     LOG_WARNING, LOG_NOTICE, LOG_INFO, LOG_DEBUG)
+if _sys.version_info >= (3,3):
+    from collections import ChainMap as _ChainMap
+
 from ._journal import __version__, sendv, stream_fd
 from ._reader import (_Reader, NOP, APPEND, INVALIDATE,
                       LOCAL_ONLY, RUNTIME_ONLY,
@@ -241,7 +242,7 @@ class Reader(_Reader):
         Entries will be processed with converters specified during Reader
         creation.
 
-        Optional skip value will return the `skip`\-th log entry.
+        Optional skip value will return the `skip`-th log entry.
 
         Currently a standard dictionary of fields is returned, but in the
         future this might be changed to a different mapping type, so the
@@ -261,7 +262,7 @@ class Reader(_Reader):
 
         Equivalent to get_next(-skip).
 
-        Optional skip value will return the -`skip`\-th log entry.
+        Optional skip value will return the -`skip`-th log entry.
 
         Entries will be processed with converters specified during Reader
         creation.
@@ -561,7 +562,7 @@ class JournalHandler(_logging.Handler):
             msg = self.format(record)
             pri = self.mapPriority(record.levelno)
             mid = getattr(record, 'MESSAGE_ID', None)
-            extras = { k:str(v) for k,v in self._extra.items() }
+            extras = {k:str(v) for k,v in self._extra.items()}
             extras.update({
                 k:str(v) for k,v in record.__dict__.items()
             })
diff --git a/systemd/test/test_daemon.py b/systemd/test/test_daemon.py
index c1e08c7..ae76e54 100644
--- a/systemd/test/test_daemon.py
+++ b/systemd/test/test_daemon.py
@@ -243,12 +243,12 @@ def test_listen_fds_default_unset():
     assert listen_fds() == []
 
 def test_notify_no_socket():
-    assert notify('READY=1') == False
+    assert notify('READY=1') is False
     with skip_enosys():
-        assert notify('FDSTORE=1', fds=[]) == False
-    assert notify('FDSTORE=1', fds=[1,2]) == False
-    assert notify('FDSTORE=1', pid=os.getpid()) == False
-    assert notify('FDSTORE=1', pid=os.getpid(), fds=(1,)) == False
+        assert notify('FDSTORE=1', fds=[]) is False
+    assert notify('FDSTORE=1', fds=[1, 2]) is False
+    assert notify('FDSTORE=1', pid=os.getpid()) is False
+    assert notify('FDSTORE=1', pid=os.getpid(), fds=(1,)) is False
 
 if sys.version_info >= (3,):
     connection_error = ConnectionRefusedError
@@ -264,7 +264,7 @@ def test_notify_bad_socket():
         with skip_enosys():
             notify('FDSTORE=1', fds=[])
     with pytest.raises(connection_error):
-        notify('FDSTORE=1', fds=[1,2])
+        notify('FDSTORE=1', fds=[1, 2])
     with pytest.raises(connection_error):
         notify('FDSTORE=1', pid=os.getpid())
     with pytest.raises(connection_error):
@@ -282,9 +282,9 @@ def test_notify_with_socket(tmpdir):
     sock.setsockopt(socket.SOL_SOCKET, SO_PASSCRED, 1)
     os.environ['NOTIFY_SOCKET'] = path
 
-    assert notify('READY=1') == True
+    assert notify('READY=1')
     with skip_enosys():
-        assert notify('FDSTORE=1', fds=[]) == True
-    assert notify('FDSTORE=1', fds=[1,2]) == True
-    assert notify('FDSTORE=1', pid=os.getpid()) == True
-    assert notify('FDSTORE=1', pid=os.getpid(), fds=(1,)) == True
+        assert notify('FDSTORE=1', fds=[])
+    assert notify('FDSTORE=1', fds=[1, 2])
+    assert notify('FDSTORE=1', pid=os.getpid())
+    assert notify('FDSTORE=1', pid=os.getpid(), fds=(1,))
diff --git a/systemd/test/test_journal.py b/systemd/test/test_journal.py
index fd38036..582b031 100644
--- a/systemd/test/test_journal.py
+++ b/systemd/test/test_journal.py
@@ -194,14 +194,14 @@ def test_reader_has_runtime_files(tmpdir):
     with j:
         with skip_oserror(errno.ENOSYS):
             ans = j.has_runtime_files()
-    assert ans == False
+    assert ans is False
 
 def test_reader_has_persistent_files(tmpdir):
     j = journal.Reader(path=tmpdir.strpath)
     with j:
         with skip_oserror(errno.ENOSYS):
             ans = j.has_runtime_files()
-    assert ans == False
+    assert ans is False
 
 def test_reader_converters(tmpdir):
     converters = {'xxx' : lambda arg: 'yyy'}