Merge lp:~gocept/landscape-client/python3 into lp:~landscape/landscape-client/trunk

[Daniel Havlik]

* Changed a lot of files to be python 3.5 syntax compatible
* Introduced landscape.compat containing some helpers
* Used twisted.python.compat for python 3 detection and some helpers from there
* Almost all tests run with python 3.5 (2163 of 2178 - run them with make check3)

* Everything should still work with python 2 as before.

* Changed a lot of files to be python 3.5 syntax compatible
* Introduced landscape.compat containing some helpers
* Used twisted.python.compat for python 3 detection and some helpers from there
* Almost all tests run with python 3.5 (2163 of 2178 - run them with make check3)

* Everything should still work with python 2 as before.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Fail
Revno: 953
Branch: lp:~nilo/landscape-client/python3
Jenkins: https://ci.lscape.net/job/latch-test-precise/857/

review: Needs Fixing (test results)

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

review: Needs Fixing

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Fail
Revno: 953
Branch: lp:~nilo/landscape-client/python3
Jenkins: https://ci.lscape.net/job/latch-test-precise/859/

review: Needs Fixing (test results)

[Adam Collard (adam-collard)]

The failure messages from that Jenkins run are: http://paste.ubuntu.com/23827074/

[Adam Collard (adam-collard)]

Looking pretty good! Have added some initial comments inline.

[lp:~gocept/landscape-client/python3]

954. By Daniel Havlik on 2017-01-19

use passlib provided salt generation (as passlib limits the characters for salt to ./a-zA-Z0-9)

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 954
Branch: lp:~nilo/landscape-client/python3
Jenkins: https://ci.lscape.net/job/latch-test-precise/860/

review: Approve (test results)

[Steffen Allner (sallner)]

I addressed the comments from r953 at https://code.launchpad.net/~sallner/landscape-client/fixing-mp-1/+merge/315349. Adam, did you already had a look at the rest of the MP?

[Adam Collard (adam-collard)]

> I addressed the comments from r953 at https://code.launchpad.net/~sallner
> /landscape-client/fixing-mp-1/+merge/315349.

Hmm, this is arguably the Wrong Way To Do It™.

This will require Daniel to merge your branch into his. Ideally Daniel would have made these fixes and just "bzr push"'d the fixes (only Daniel has write permission to his branches).

Alternatively, you can create a team in Launchpad (e.g. ~gocept) then push the branch to that team's namespace (e.g. lp:~gocept/landscape-client/python3) and everyone in that team will have write permission. That gives you flexibility on your side on who does the work.

> Adam, did you already had a look
> at the rest of the MP?

I don't have further comments to make at this stage, but would like to take a fresh look with the fixes I suggested.

[lp:~gocept/landscape-client/python3]

955. By Daniel Havlik on 2017-01-24

merge fixes by sallner

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 955
Branch: lp:~nilo/landscape-client/python3
Jenkins: https://ci.lscape.net/job/latch-test-precise/861/

review: Approve (test results)

[Daniel Havlik (nilo)]

review: Approve

[Steffen Allner (sallner)]

LGTM

review: Approve

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 955
Branch: lp:~nilo/landscape-client/python3
Jenkins: https://ci.lscape.net/job/latch-test-precise/864/

review: Approve (test results)

[Adam Collard (adam-collard)]

Sorry this took so long to review. Please see inline comments about bpickle (and a couple of nit-picks)

review: Needs Information

[lp:~gocept/landscape-client/python3]

956. By Daniel Havlik on 2017-03-06

remove dead code

957. By Daniel Havlik on 2017-03-06

revert compatibility changes on bpickle, use "new" bpickle3 instead / add compat import for cpickle

958. By Daniel Havlik on 2017-03-06

backmerge from trunk

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 958
Branch: lp:~nilo/landscape-client/python3
Jenkins: https://ci.lscape.net/job/latch-test-precise/886/

review: Approve (test results)

[Steffen Allner (sallner)]

Adam, we have addressed your comments and also merged the master into this branch. It would be good to have this branch merged into master, as it would be easier to directly depend on the master instead of this branch for further development.

[Adam Collard (adam-collard)]

review: Abstain

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 958
Branch: lp:~nilo/landscape-client/python3
Jenkins: https://ci.lscape.net/job/latch-test-xenial/1456/

review: Approve (test results)

[Free Ekanayaka (free.ekanayaka)]

This branch looks mostly good to me.

The main concern I have is about the test skips being added. Assuming those are temporary, and will be removed in follow up branches, I'm +1 for landing. If that's not the case, please let me know.

review: Approve

[lp:~gocept/landscape-client/python3]

959. By Daniel Havlik on 2017-03-09

Insert test for `long` and make them work under Python 3.

[Steffen Allner (sallner)]

> This branch looks mostly good to me.
>
> The main concern I have is about the test skips being added. Assuming those
> are temporary, and will be removed in follow up branches, I'm +1 for landing.
> If that's not the case, please let me know.

The tests have been only skipped to allow a run of the testsuite in a reasonable time, as some got stuck or had a long timeout. I could already activate some in the MP to `landscape.lib.amp` https://code.launchpad.net/~gocept/landscape-client/py3-amp/+merge/319452

[Данило Шеган (danilo)]

I have to step out for a bit again: here're the comments so far (some are nitpicking trivials, sorry).

Please reply inline using the "reply" link next to each of my comments: that makes it so much easier to understand what you've done to address a comment.

I'll continue with this branch later.

review: Needs Fixing

[Steffen Allner (sallner)]

Oh, mea culpa. I just realised how to save inline comments. So here are the now already old ones addressing Free's comments.

[Данило Шеган (danilo)]

Not at all: that's not the most obvious part of Launchpad reviews. :-)

Here are a few more warnings: when you click on "Show diff comments" next to someone's comment, it will refresh the diff and show the revision they made the comments on. If you reply there and "save comment", those comments will still go against that older diff. If you, however, switch to a different revision, those comments will not show and might not get saved: you have to "save comment" while looking at the diff you made the comments on.

[Данило Шеган (danilo)]

Btw, now there's the conflict in the Makefile I warned about in my last comments (click on "Show diff comments" next to my previous vote to see them again): test runner won't run until the conflict is resolved.

[Данило Шеган (danilo)]

Ok, I've gone through the whole changeset: thanks for the great changes, and for a few lint fixes here and there (yes, I noticed :-)). A few nitpicks here, but there is one overarching theme: coerce_unicode() is a huge hammer that is rarely appropriate.

Basically, I would like you to do away with it and do exactly what's appropriate in each individual case. Some of the cases are pure bugs and changes in behaviour, some are unneeded, and others just indicate where code should have the decode moved elsewhere. In the few cases where a simple "decode_if_python2" logic _is_ appropriate, you might just as well inline the logic.

Another thing I'd like fixed is switch from FakeStatvfsResult to the real os.statvfs_result, but to speed up getting this landed, I am happy to have that done in a separate branch later.

Also, make sure to resolve conflicts.

review: Needs Fixing

[Данило Шеган (danilo)]

Darn, most of my comments got lost when the branch moved from ~nilo to ~gocept. Resubmitting the rest.

(Note that you should go through my previous set of comments as well, which cover the first ~1000 lines of the diff, but some of them are now obsolete since I want you to drop coerce_unicode entirely)

[Steffen Allner (sallner)]

I also got my comments deleted during the switch. This is the response to the very first batch. I am working on your other comments and agree with you on the removal of coerce_unicode(). It was introduced as a helper to get rid of the encoding/decoding errors and to run the tests with Python 3. But as you put so much effort into it already, we can remove it already at this point.

[Данило Шеган (danilo)]

Thanks for addressing my comments so far.  Feel free to say that
something is coming up in a follow up branch or two: you can also
highlight bits that you know are imperfect and which will be fixed
later and we can ignore them in reviews.

Also, I might sometimes misread a bit of code or diff, so if you think
I am wrong, shout! :)

I'll wait for the next round of changes to go over them next.  Thanks
for bearing with me :-)

[Данило Шеган (danilo)]

Btw, there's still a conflict in the Makefile "check" rule.

[Steffen Allner (sallner)]

So I integrated the second batch of changes and will push it now. I should be able to have a look at the third batch today, so that maybe we can get a merge at the beginning of the week.

[lp:~gocept/landscape-client/python3]

960. By Steffen Allner on 2017-03-10

Backmerge from trunk.

961. By Steffen Allner on 2017-03-10

Fix PEP-8 and extend output.

962. By Steffen Allner on 2017-03-10

Remove double import and improve documentation.

963. By Steffen Allner on 2017-03-10

Handle decoding explicitly here, instead of using the helper function.

964. By Steffen Allner on 2017-03-10

Restore correct docstring.

965. By Steffen Allner on 2017-03-10

Remove `landscape.md5crypt` completely and use `passlib` instead.

966. By Steffen Allner on 2017-03-10

Get rid of coerce_unicode and move encoding of script.

967. By Steffen Allner on 2017-03-10

Improve readability and PEP-8

968. By Steffen Allner on 2017-03-10

`read_file()` should do the decoding. That is coming with a future MP.

969. By Steffen Allner on 2017-03-10

Remove coerce_unicode().

970. By Steffen Allner on 2017-03-10

Formatting for readability.

971. By Steffen Allner on 2017-03-10

Remove coerce_unicode()

972. By Steffen Allner on 2017-03-10

Remove coerce_unicode() and move the decoding to the underlying function. We have to teach the makeFile() helper to write binary files for a broken encoding test.

973. By Steffen Allner on 2017-03-10

Use `os.statsvfs_result()` instead of the fake one and use a fixture in tests.

974. By Steffen Allner on 2017-03-10

Remove coerce_unicode().

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[Steffen Allner (sallner)]

Oh, all your diff comments were shown combined, so I should be finished with it now. It is your turn again. The conflict in check should be solved with http://bazaar.launchpad.net/~gocept/landscape-client/python3/revision/960 .

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 974
Branch: lp:~gocept/landscape-client/python3
Jenkins: https://ci.lscape.net/job/latch-test-xenial/2039/

review: Approve (test results)

[Данило Шеган (danilo)]

(Save a few replies on the older rev, nothing to act on)

[Данило Шеган (danilo)]

Right, all comments on a single revision will show combined: only when a code change is pushed after one set of comments they might be separate (though, it is still possible to make comments on earlier revisions, I prefer to do it on the latest one).

Anyway, this looks great now: thanks for all the extra work, and for addressing review comments in individual commits — allows me to easily see just the relevant change.

I'll get this landed now. Note that all/some dependant branches might start seeing conflicts and you'll need to re-merge trunk once this gets in.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2016-01-07 10:45:00 +0000
+++ .bzrignore	2017-03-10 15:29:37 +0000
@@ -23,3 +23,4 @@
 apt-update/apt-update
 docs
 tags
+_last_py2_res

=== modified file 'Makefile'
--- Makefile	2017-03-09 09:18:28 +0000
+++ Makefile	2017-03-10 15:29:37 +0000
@@ -1,8 +1,9 @@
 PYDOCTOR ?= pydoctor
-TXT2MAN ?= txt2man 
+TXT2MAN ?= txt2man
 PYTHON ?= python
-TRIAL_ARGS ?= 
-TEST_COMMAND = trial --unclean-warnings $(TRIAL_ARGS) landscape
+TRIAL_ARGS ?=
+TEST_COMMAND_PY2 = trial --unclean-warnings $(TRIAL_ARGS) landscape
+TEST_COMMAND_PY3 = trial3 --unclean-warnings $(TRIAL_ARGS) landscape
 UBUNTU_RELEASE := $(shell lsb_release -cs)
 # version in the code is authoritative
 # Use := here, not =, it's really important, otherwise UPSTREAM_VERSION
@@ -19,11 +20,22 @@
 
 all: build
 
+build3:
+	python3 setup.py build_ext -i
+
 build:
 	$(PYTHON) setup.py build_ext -i
 
+check5:
+	-trial --unclean-warnings --reporter=summary landscape > _last_py2_res
+	-trial3 --unclean-warnings landscape
+	./display_py2_testresults
+
+check3: build3
+	LC_ALL=C $(TEST_COMMAND_PY3)
+
 check: build
-	LC_ALL=C $(TEST_COMMAND)
+	LC_ALL=C $(TEST_COMMAND_PY2)
 
 lint:
 	bzr ls-lint

=== modified file 'debian/control'
--- debian/control	2017-01-18 09:11:59 +0000
+++ debian/control	2017-03-10 15:29:37 +0000
@@ -14,6 +14,7 @@
          python-twisted-core,
          python-configobj,
          python-apt,
+         python-passlib,
          ca-certificates,
          python-gdbm,
          lsb-release,

=== added file 'display_py2_testresults'
--- display_py2_testresults	1970-01-01 00:00:00 +0000
+++ display_py2_testresults	2017-03-10 15:29:37 +0000
@@ -0,0 +1,13 @@
+#!/usr/bin/python
+with open('_last_py2_res', 'r') as py2res:
+    lines = py2res.readlines()
+
+lastline = lines[-1]
+
+time, total, total, err, fail, skip = lastline.split()
+
+if "".join((err, fail, skip)) != "000":
+    print("Python 2: \033[91mFAILED\033[0m (skips={}, failures={}, "
+          "errors={}, total={})".format(skip, fail, err, total))
+else:
+    print("Python 2: \033[92mOK\033[0m (total={})".format(total))

=== modified file 'landscape/broker/amp.py'
--- landscape/broker/amp.py	2015-03-04 14:22:17 +0000
+++ landscape/broker/amp.py	2017-03-10 15:29:37 +0000
@@ -1,4 +1,5 @@
 from twisted.internet.defer import maybeDeferred, execute, succeed
+from twisted.python.compat import iteritems
 
 from landscape.lib.amp import RemoteObject, MethodCallArgument
 from landscape.amp import ComponentConnector, get_remote_methods
@@ -30,7 +31,7 @@
         """
         result = self.listen_events(handlers.keys())
         return result.addCallback(
-            lambda (event_type, kwargs): handlers[event_type](**kwargs))
+            lambda args: handlers[args[0]](**args[1]))
 
 
 class FakeRemoteBroker(object):
@@ -53,7 +54,7 @@
             def method(*args, **kwargs):
                 for arg in args:
                     assert MethodCallArgument.check(arg)
-                for k, v in kwargs.iteritems():
+                for k, v in iteritems(kwargs):
                     assert MethodCallArgument.check(v)
                 return execute(original, *args, **kwargs)
             return method
@@ -75,7 +76,7 @@
         """
         result = self.broker_server.listen_events(handlers.keys())
         return result.addCallback(
-            lambda (event_type, kwargs): handlers[event_type](**kwargs))
+            lambda args: handlers[args[0]](**args[1]))
 
     def register(self):
         return succeed(None)

=== modified file 'landscape/broker/ping.py'
--- landscape/broker/ping.py	2013-06-27 10:25:39 +0000
+++ landscape/broker/ping.py	2017-03-10 15:29:37 +0000
@@ -39,7 +39,7 @@
 from twisted.python.failure import Failure
 from twisted.internet import defer
 
-from landscape.lib.bpickle import loads
+from landscape.compat import bpickle
 from landscape.lib.fetch import fetch
 from landscape.lib.log import log_failure
 
@@ -84,7 +84,7 @@
         the response indicates that their are messages waiting for
         this computer, False otherwise.
         """
-        if loads(webtext) == {"messages": True}:
+        if bpickle.loads(webtext) == {"messages": True}:
             return True
 
 

=== modified file 'landscape/broker/store.py'
--- landscape/broker/store.py	2014-12-12 13:25:39 +0000
+++ landscape/broker/store.py	2017-03-10 15:29:37 +0000
@@ -97,8 +97,10 @@
 import os
 import uuid
 
+from twisted.python.compat import iteritems
+
 from landscape import DEFAULT_SERVER_API
-from landscape.lib import bpickle
+from landscape.compat import bpickle
 from landscape.lib.fs import create_file
 from landscape.lib.versioning import sort_versions, is_version_higher
 
@@ -261,7 +263,7 @@
             data = self._get_content(self._message_dir(filename))
             try:
                 message = bpickle.loads(data)
-            except ValueError, e:
+            except ValueError as e:
                 logging.exception(e)
                 self._add_flags(filename, BROKEN)
             else:
@@ -453,7 +455,7 @@
             flags = self._get_flags(old_filename)
             try:
                 message = bpickle.loads(self._get_content(old_filename))
-            except ValueError, e:
+            except ValueError as e:
                 logging.exception(e)
                 if HELD not in flags:
                     offset += 1
@@ -500,7 +502,7 @@
             information, limited by scope.
         """
         session_ids = self._persist.get("session-ids", {})
-        for session_id, stored_scope in session_ids.iteritems():
+        for session_id, stored_scope in iteritems(session_ids):
             # This loop should be relatively short as it's intent is to limit
             # session-ids to one per scope.  The or condition here is not
             # strictly necessary, but we *should* do "is" comparisons when we
@@ -524,7 +526,7 @@
         new_session_ids = {}
         if scopes:
             session_ids = self._persist.get("session-ids", {})
-            for session_id, session_scope in session_ids.iteritems():
+            for session_id, session_scope in iteritems(session_ids):
                 if session_scope not in scopes:
                     new_session_ids[session_id] = session_scope
         self._persist.set("session-ids", new_session_ids)

=== modified file 'landscape/broker/tests/test_ping.py'
--- landscape/broker/tests/test_ping.py	2013-04-04 10:38:29 +0000
+++ landscape/broker/tests/test_ping.py	2017-03-10 15:29:37 +0000
@@ -2,7 +2,7 @@
 
 from twisted.internet.defer import fail
 
-from landscape.lib.bpickle import dumps
+from landscape.compat import bpickle
 from landscape.lib.fetch import fetch
 from landscape.reactor import FakeReactor
 from landscape.broker.ping import PingClient, Pinger
@@ -25,7 +25,7 @@
         data.
         """
         self.fetches.append((url, post, headers, data))
-        return dumps(self.response)
+        return bpickle.dumps(self.response)
 
     def failing_get_page(self, url, post, headers, data):
         """

=== modified file 'landscape/broker/tests/test_transport.py'
--- landscape/broker/tests/test_transport.py	2016-03-04 08:57:40 +0000
+++ landscape/broker/tests/test_transport.py	2017-03-10 15:29:37 +0000
@@ -3,7 +3,7 @@
 from landscape import VERSION
 from landscape.broker.transport import HTTPTransport
 from landscape.lib.fetch import PyCurlError
-from landscape.lib import bpickle
+from landscape.compat import bpickle
 
 from landscape.tests.helpers import LandscapeTest, LogKeeperHelper
 

=== modified file 'landscape/broker/transport.py'
--- landscape/broker/transport.py	2014-10-03 10:06:24 +0000
+++ landscape/broker/transport.py	2017-03-10 15:29:37 +0000
@@ -6,8 +6,10 @@
 
 import pycurl
 
+from twisted.python.compat import unicode
+
+from landscape.compat import bpickle
 from landscape.lib.fetch import fetch
-from landscape.lib import bpickle
 from landscape.log import format_delta
 from landscape import SERVER_API, VERSION
 

=== added file 'landscape/compat.py'
--- landscape/compat.py	1970-01-01 00:00:00 +0000
+++ landscape/compat.py	2017-03-10 15:29:37 +0000
@@ -0,0 +1,62 @@
+from twisted.python.compat import _PY3
+
+if _PY3:
+    import _pickle as cPickle
+    from landscape.lib import bpickle3 as bpickle
+    from configparser import ConfigParser, NoOptionError
+    SafeConfigParser = ConfigParser
+
+    import _thread as thread
+
+    from io import StringIO
+    stringio = cstringio = StringIO
+
+else:
+    import cPickle
+    from landscape.lib import bpickle
+    from ConfigParser import ConfigParser, NoOptionError, SafeConfigParser
+
+    import thread
+
+    from StringIO import StringIO
+    stringio = StringIO
+    from cStringIO import StringIO as cstringio
+
+
+def coerce_unicode(s, encoding='ascii', errors='strict'):
+    """
+    Coerce byte strings into unicode for Python 2.
+
+    In Python 2, decodes a byte string L{s} into unicode using the L{encoding},
+    returns unmodified if any other type. In Python 3, raises a L{TypeError}
+    when passed a byte string in L{s}, returns unmodified otherwise.
+
+    @param s: The string to be converted to unicode.
+    @type s: L{bytes} or L{unicode}
+    @raise UnicodeError: The input L{bytes} is not decodable
+        with given encoding.
+    @raise TypeError: The input is L{bytes} on Python 3.
+    """
+    # In Python 2 C{unicode(b'bytes')} returns a unicode string C{'bytes'}. In
+    # Python 3, the equivalent C{str(b'bytes')} will return C{"b'bytes'"}
+    # instead.
+    if isinstance(s, bytes):
+        if _PY3:
+            raise TypeError("Expected str not %r (bytes)" % (s,))
+        else:
+            return s.decode(encoding, errors)
+    else:
+        return s
+
+
+def convert_buffer_to_string(mem_view):
+    """
+    Converts a buffer in Python 2 or a memoryview in Python 3 to str.
+
+    @param mem_view: The view to convert.
+    """
+    if _PY3:
+        result = mem_view.decode('ascii')
+    else:
+        result = str(mem_view)
+    return result

=== modified file 'landscape/configuration.py'
--- landscape/configuration.py	2017-03-03 13:52:57 +0000
+++ landscape/configuration.py	2017-03-10 15:29:37 +0000
@@ -13,7 +13,7 @@
 import pwd
 import sys
 
-from StringIO import StringIO
+from landscape.compat import StringIO
 
 from landscape.lib.tag import is_valid_tag
 
@@ -565,9 +565,9 @@
 def bootstrap_tree(config):
     """Create the client directories tree."""
     bootstrap_list = [
-        BootstrapDirectory("$data_path", "landscape", "root", 0755),
+        BootstrapDirectory("$data_path", "landscape", "root", 0o755),
         BootstrapDirectory("$annotations_path", "landscape", "landscape",
-                           0755)]
+                           0o755)]
     BootstrapList(bootstrap_list).bootstrap(
         data_path=config.data_path, annotations_path=config.annotations_path)
 
@@ -756,7 +756,7 @@
     config = LandscapeSetupConfiguration()
     try:
         config.load(args)
-    except ImportOptionError, error:
+    except ImportOptionError as error:
         print_text(str(error), error=True)
         sys.exit(1)
 
@@ -775,7 +775,7 @@
     # Setup client configuration.
     try:
         setup(config)
-    except Exception, e:
+    except Exception as e:
         print_text(str(e))
         sys.exit("Aborting Landscape configuration")
 

=== modified file 'landscape/deployment.py'
--- landscape/deployment.py	2014-09-24 08:09:55 +0000
+++ landscape/deployment.py	2017-03-10 15:29:37 +0000
@@ -13,6 +13,8 @@
 
 from landscape.upgraders import UPGRADE_MANAGERS
 
+from twisted.python.compat import StringType as basestring
+
 
 def init_logging(configuration, program_name):
     """Given a basic configuration, set up logging."""
@@ -40,8 +42,8 @@
 
     def add_option(self, *args, **kwargs):
         option = OptionParser.add_option(self, *args, **kwargs)
-        print dir(option)
-        print option.get_opt_string()
+        print(dir(option))
+        print(option.get_opt_string())
         return option
 
 
@@ -235,7 +237,7 @@
         try:
             config_obj = ConfigObj(config_source, list_values=False,
                                    raise_errors=False, write_empty_values=True)
-        except ConfigObjError, e:
+        except ConfigObjError as e:
             logger = getLogger()
             logger.warn(str(e))
             # Good configuration values are recovered here

=== modified file 'landscape/diff.py'
--- landscape/diff.py	2008-06-10 10:56:01 +0000
+++ landscape/diff.py	2017-03-10 15:29:37 +0000
@@ -4,8 +4,8 @@
     @return: A 3-tuple of dicts with the changes that would need to be
         made to convert C{old} into C{new}: C{(creates, updates, deletes)}
     """
-    new_keys = set(new.iterkeys())
-    old_keys = set(old.iterkeys())
+    new_keys = set(new)
+    old_keys = set(old)
 
     creates = {}
     for key in new_keys - old_keys:

=== modified file 'landscape/lib/amp.py'
--- landscape/lib/amp.py	2013-05-13 12:51:30 +0000
+++ landscape/lib/amp.py	2017-03-10 15:29:37 +0000
@@ -49,11 +49,12 @@
 from twisted.internet.defer import Deferred, maybeDeferred, succeed
 from twisted.internet.protocol import ServerFactory, ReconnectingClientFactory
 from twisted.python.failure import Failure
+from twisted.python.compat import xrange
 
 from twisted.protocols.amp import (
     Argument, String, Integer, Command, AMP, MAX_VALUE_LENGTH, CommandLocator)
 
-from landscape.lib.bpickle import loads, dumps, dumps_table
+from landscape.compat import bpickle
 
 
 class MethodCallArgument(Argument):
@@ -61,16 +62,16 @@
 
     def toString(self, inObject):
         """Serialize an argument."""
-        return dumps(inObject)
+        return bpickle.dumps(inObject)
 
     def fromString(self, inString):
         """Unserialize an argument."""
-        return loads(inString)
+        return bpickle.loads(inString)
 
     @classmethod
     def check(cls, inObject):
         """Check if an argument is serializable."""
-        return type(inObject) in dumps_table
+        return type(inObject) in bpickle.dumps_table
 
 
 class MethodCallError(Exception):
@@ -95,13 +96,13 @@
       and C{kwargs} the keyword ones.
     """
 
-    arguments = [("sequence", Integer()),
-                 ("method", String()),
-                 ("arguments", String())]
-
-    response = [("result", MethodCallArgument())]
-
-    errors = {MethodCallError: "METHOD_CALL_ERROR"}
+    arguments = [(b"sequence", Integer()),
+                 (b"method", String()),
+                 (b"arguments", String())]
+
+    response = [(b"result", MethodCallArgument())]
+
+    errors = {MethodCallError: b"METHOD_CALL_ERROR"}
 
 
 class MethodCallChunk(Command):
@@ -119,12 +120,12 @@
       being split and buffered.
     """
 
-    arguments = [("sequence", Integer()),
-                 ("chunk", String())]
-
-    response = [("result", Integer())]
-
-    errors = {MethodCallError: "METHOD_CALL_ERROR"}
+    arguments = [(b"sequence", Integer()),
+                 (b"chunk", String())]
+
+    response = [(b"result", Integer())]
+
+    errors = {MethodCallError: b"METHOD_CALL_ERROR"}
 
 
 class MethodCallReceiver(CommandLocator):
@@ -164,7 +165,7 @@
             chunks.append(arguments)
             arguments = "".join(chunks)
 
-        args, kwargs = loads(arguments)
+        args, kwargs = bpickle.loads(arguments)
 
         if not method in self._methods:
             raise MethodCallError("Forbidden method '%s'" % method)
@@ -260,7 +261,7 @@
             invoked on the remote object. If the remote method itself returns
             a deferred, we fire with the callback value of such deferred.
         """
-        arguments = dumps((args, kwargs))
+        arguments = bpickle.dumps((args, kwargs))
         sequence = uuid4().int
 
         # Split the given arguments in one or more chunks

=== modified file 'landscape/lib/bpickle.py'
--- landscape/lib/bpickle.py	2008-06-10 10:56:01 +0000
+++ landscape/lib/bpickle.py	2017-03-10 15:29:37 +0000
@@ -158,4 +158,3 @@
                      "t": loads_tuple,
                      "d": loads_dict,
                      "n": loads_none     })
-

=== added file 'landscape/lib/bpickle3.py'
--- landscape/lib/bpickle3.py	1970-01-01 00:00:00 +0000
+++ landscape/lib/bpickle3.py	2017-03-10 15:29:37 +0000
@@ -0,0 +1,171 @@
+"""Copyright (c) 2006, Gustavo Niemeyer <[e-mail]>
+Port to python 3 was done by Chris Glass <[e-mail]>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of the copyright holder nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This file is modified from the original to work with python3, but should be
+wire compatible and behave the same way (bugs notwithstanding).
+"""
+
+
+dumps_table = {}
+loads_table = {}
+
+
+def dumps(obj, _dt=dumps_table):
+    try:
+        return _dt[type(obj)](obj).encode("UTF-8")
+    except KeyError as e:
+        raise ValueError("Unsupported type: %s" % e)
+
+
+def loads(byte_string, _lt=loads_table):
+    if not byte_string:
+        raise ValueError("Can't load empty string")
+    unicode_string = byte_string.decode()
+    try:
+        return _lt[unicode_string[0]](unicode_string, 0)[0]
+    except KeyError as e:
+        raise ValueError("Unknown type character: %s" % e)
+    except IndexError:  #pragma: nocover
+        # NOTE: Not sure if reachable (chrisglass during py3 conversion)
+        raise ValueError("Corrupted data")
+
+
+def dumps_bool(obj):
+    return "b%d" % int(obj)
+
+
+def dumps_int(obj):
+    return "i%s;" % obj
+
+
+def dumps_float(obj):
+    return "f%r;" % obj
+
+
+def dumps_str(obj):
+    return "s%s:%s" % (len(obj), obj)
+
+
+def dumps_list(obj, _dt=dumps_table):
+    return "l%s;" % "".join([_dt[type(val)](val) for val in obj])
+
+
+def dumps_tuple(obj, _dt=dumps_table):
+    return "t%s;" % "".join([_dt[type(val)](val) for val in obj])
+
+
+def dumps_dict(obj, _dt=dumps_table):
+    keys = list(obj.keys())
+    keys.sort()
+    res = []
+    append = res.append
+    for key in keys:
+        val = obj[key]
+        append(_dt[type(key)](key))
+        append(_dt[type(val)](val))
+    return "d%s;" % "".join(res)
+
+
+def dumps_none(obj):
+    return "n"
+
+
+def loads_bool(str, pos):
+    return bool(int(str[pos+1])), pos+2
+
+
+def loads_int(str, pos):
+    endpos = str.index(";", pos)
+    return int(str[pos+1:endpos]), endpos+1
+
+
+def loads_float(str, pos):
+    endpos = str.index(";", pos)
+    return float(str[pos+1:endpos]), endpos+1
+
+
+def loads_str(str, pos):
+    startpos = str.index(":", pos)+1
+    endpos = startpos+int(str[pos+1:startpos-1])
+    return str[startpos:endpos], endpos
+
+
+def loads_list(str, pos, _lt=loads_table):
+    pos += 1
+    res = []
+    append = res.append
+    while str[pos] != ";":
+        obj, pos = _lt[str[pos]](str, pos)
+        append(obj)
+    return res, pos+1
+
+
+def loads_tuple(str, pos, _lt=loads_table):
+    pos += 1
+    res = []
+    append = res.append
+    while str[pos] != ";":
+        obj, pos = _lt[str[pos]](str, pos)
+        append(obj)
+    return tuple(res), pos+1
+
+
+def loads_dict(str, pos, _lt=loads_table):
+    pos += 1
+    res = {}
+    while str[pos] != ";":
+        key, pos = _lt[str[pos]](str, pos)
+        val, pos = _lt[str[pos]](str, pos)
+        res[key] = val
+    return res, pos+1
+
+
+def loads_none(str, pos):
+    return None, pos+1
+
+
+dumps_table.update({       bool: dumps_bool,
+                            int: dumps_int,
+                          float: dumps_float,
+                            str: dumps_str,
+                           list: dumps_list,
+                          tuple: dumps_tuple,
+                           dict: dumps_dict,
+                     type(None): dumps_none     })
+
+loads_table.update({ "b": loads_bool,
+                     "i": loads_int,
+                     "f": loads_float,
+                     "s": loads_str,
+                     "u": loads_str,
+                     "l": loads_list,
+                     "t": loads_tuple,
+                     "d": loads_dict,
+                     "n": loads_none     })
+

=== modified file 'landscape/lib/cloud.py'
--- landscape/lib/cloud.py	2016-06-16 20:40:47 +0000
+++ landscape/lib/cloud.py	2017-03-10 15:29:37 +0000
@@ -1,5 +1,8 @@
 from landscape.lib.fetch import fetch_async
 
+from landscape.compat import coerce_unicode
+
+
 EC2_HOST = "169.254.169.254"
 EC2_API = "http://%s/latest" % (EC2_HOST,)
 MAX_LENGTH = 64
@@ -24,7 +27,7 @@
 
         def _process_result(value):
             if value is not None:
-                return value.decode("utf-8")[:MAX_LENGTH]
+                return coerce_unicode(value, "utf-8")[:MAX_LENGTH]
 
         (instance_id, instance_type, ami_id) = cloud_data
         return {

=== modified file 'landscape/lib/disk.py'
--- landscape/lib/disk.py	2013-05-15 16:06:14 +0000
+++ landscape/lib/disk.py	2017-03-10 15:29:37 +0000
@@ -1,8 +1,10 @@
 from __future__ import division
 
 import os
-import statvfs
 import re
+import codecs
+
+from twisted.python.compat import _PY3
 
 
 # List of filesystem types authorized when generating disk use statistics.
@@ -32,7 +34,10 @@
     for line in open(mounts_file):
         try:
             device, mount_point, filesystem = line.split()[:3]
-            mount_point = mount_point.decode("string-escape")
+            if _PY3:
+                mount_point = codecs.decode(mount_point, "unicode_escape")
+            else:
+                mount_point = codecs.decode(mount_point, "string_escape")
         except ValueError:
             continue
         if (filesystems_whitelist is not None and
@@ -43,9 +48,9 @@
             stats = statvfs_(mount_point)
         except OSError:
             continue
-        block_size = stats[statvfs.F_BSIZE]
-        total_space = (stats[statvfs.F_BLOCKS] * block_size) // megabytes
-        free_space = (stats[statvfs.F_BFREE] * block_size) // megabytes
+        block_size = stats.f_bsize
+        total_space = (stats.f_blocks * block_size) // megabytes
+        free_space = (stats.f_bfree * block_size) // megabytes
         yield {"device": device, "mount-point": mount_point,
                "filesystem": filesystem, "total-space": total_space,
                "free-space": free_space}

=== modified file 'landscape/lib/encoding.py'
--- landscape/lib/encoding.py	2013-03-19 14:58:59 +0000
+++ landscape/lib/encoding.py	2017-03-10 15:29:37 +0000
@@ -1,3 +1,4 @@
+from twisted.python.compat import iteritems, unicode
 
 
 def encode_if_needed(value):
@@ -13,6 +14,6 @@
     """
     A wrapper taking a dict and passing each of the values to encode_if_needed.
     """
-    for key, value in values.iteritems():
+    for key, value in iteritems(values):
         values[key] = encode_if_needed(value)
     return values

=== modified file 'landscape/lib/fetch.py'
--- landscape/lib/fetch.py	2016-08-02 12:52:30 +0000
+++ landscape/lib/fetch.py	2017-03-10 15:29:37 +0000
@@ -2,10 +2,12 @@
 import sys
 
 from optparse import OptionParser
-from StringIO import StringIO
 
+from twisted.internet.defer import DeferredList
 from twisted.internet.threads import deferToThread
-from twisted.internet.defer import DeferredList
+from twisted.python.compat import iteritems
+
+from landscape.compat import StringIO
 
 
 class FetchError(Exception):
@@ -84,7 +86,7 @@
 
     if headers:
         curl.setopt(pycurl.HTTPHEADER,
-                    ["%s: %s" % pair for pair in sorted(headers.iteritems())])
+                    ["%s: %s" % pair for pair in sorted(iteritems(headers))])
 
     if insecure:
         curl.setopt(pycurl.SSL_VERIFYPEER, False)
@@ -109,7 +111,7 @@
 
     try:
         curl.perform()
-    except pycurl.error, e:
+    except pycurl.error as e:
         raise PyCurlError(e.args[0], e.args[1])
 
     body = input.getvalue()
@@ -197,8 +199,8 @@
     parser.add_option("--data", default="")
     parser.add_option("--cainfo")
     options, (url,) = parser.parse_args(args)
-    print fetch(url, post=options.post, data=options.data,
-                cainfo=options.cainfo)
+    print(fetch(url, post=options.post, data=options.data,
+                cainfo=options.cainfo))
 
 
 if __name__ == "__main__":

=== modified file 'landscape/lib/gpg.py'
--- landscape/lib/gpg.py	2009-10-27 09:33:45 +0000
+++ landscape/lib/gpg.py	2017-03-10 15:29:37 +0000
@@ -22,7 +22,8 @@
         shutil.rmtree(gpg_home)
         return ignored
 
-    def check_gpg_exit_code((out, err, code)):
+    def check_gpg_exit_code(args):
+        out, err, code = args
         if code != 0:
             raise InvalidGPGSignature("%s failed (out='%s', err='%s', "
                                       "code='%d')" % (gpg, out, err, code))

=== modified file 'landscape/lib/hashlib.py'
--- landscape/lib/hashlib.py	2013-01-03 07:09:48 +0000
+++ landscape/lib/hashlib.py	2017-03-10 15:29:37 +0000
@@ -1,6 +1,5 @@
 """Provide backward compatible access to hashlib functions."""
 
-
 try:
     _hashlib = __import__("hashlib")
 except ImportError:

=== removed file 'landscape/lib/md5crypt.py'
--- landscape/lib/md5crypt.py	2009-08-23 07:05:22 +0000
+++ landscape/lib/md5crypt.py	1970-01-01 00:00:00 +0000
@@ -1,159 +0,0 @@
-#########################################################
-# md5crypt.py
-#
-# 0423.2000 by michal wallace http://www.sabren.com/
-# based on perl's Crypt::PasswdMD5 by Luis Munoz ([e-mail])
-# based on /usr/src/libcrypt/crypt.c from FreeBSD 2.2.5-RELEASE
-#
-# MANY THANKS TO
-#
-#  Carey Evans - http://home.clear.net.nz/pages/c.evans/
-#  Dennis Marti - http://users.starpower.net/marti1/
-#
-#  For the patches that got this thing working!
-#
-#########################################################
-"""md5crypt.py - Provides interoperable MD5-based crypt() function
-
-SYNOPSIS
-
-	import md5crypt.py
-
-	cryptedpassword = md5crypt.md5crypt(password, salt);
-
-DESCRIPTION
-
-unix_md5_crypt() provides a crypt()-compatible interface to the
-rather new MD5-based crypt() function found in modern operating systems.
-It's based on the implementation found on FreeBSD 2.2.[56]-RELEASE and
-contains the following license in it:
-
- "THE BEER-WARE LICENSE" (Revision 42):
- <[e-mail]> wrote this file.  As long as you retain this notice you
- can do whatever you want with this stuff. If we meet some day, and you think
- this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
-
-apache_md5_crypt() provides a function compatible with Apache's
-.htpasswd files. This was contributed by Bryan Hart <[e-mail]>.
-
-"""
-
-MAGIC = '$1$'			# Magic string
-ITOA64 = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
-
-from landscape.lib.hashlib import md5
-
-def to64 (v, n):
-    ret = ''
-    while (n - 1 >= 0):
-        n = n - 1
-	ret = ret + ITOA64[v & 0x3f]
-	v = v >> 6
-    return ret
-
-
-def apache_md5_crypt (pw, salt):
-    # change the Magic string to match the one used by Apache
-    return unix_md5_crypt(pw, salt, '$apr1$')
-
-
-def unix_md5_crypt(pw, salt, magic=None):
-
-    if magic==None:
-        magic = MAGIC
-
-    # Take care of the magic string if present
-    if salt[:len(magic)] == magic:
-        salt = salt[len(magic):]
-
-
-    # salt can have up to 8 characters:
-    import string
-    salt = string.split(salt, '$', 1)[0]
-    salt = salt[:8]
-
-    ctx = pw + magic + salt
-
-    final = md5(pw + salt + pw).digest()
-
-    for pl in range(len(pw),0,-16):
-        if pl > 16:
-            ctx = ctx + final[:16]
-        else:
-            ctx = ctx + final[:pl]
-
-
-    # Now the 'weird' xform (??)
-
-    i = len(pw)
-    while i:
-        if i & 1:
-            ctx = ctx + chr(0)  #if ($i & 1) { $ctx->add(pack("C", 0)); }
-        else:
-            ctx = ctx + pw[0]
-        i = i >> 1
-
-    final = md5(ctx).digest()
-
-    # The following is supposed to make
-    # things run slower.
-
-    # my question: WTF???
-
-    for i in range(1000):
-        ctx1 = ''
-        if i & 1:
-            ctx1 = ctx1 + pw
-        else:
-            ctx1 = ctx1 + final[:16]
-
-        if i % 3:
-            ctx1 = ctx1 + salt
-
-        if i % 7:
-            ctx1 = ctx1 + pw
-
-        if i & 1:
-            ctx1 = ctx1 + final[:16]
-        else:
-            ctx1 = ctx1 + pw
-
-
-        final = md5(ctx1).digest()
-
-
-    # Final xform
-
-    passwd = ''
-
-    passwd = passwd + to64((int(ord(final[0])) << 16)
-                           |(int(ord(final[6])) << 8)
-                           |(int(ord(final[12]))),4)
-
-    passwd = passwd + to64((int(ord(final[1])) << 16)
-                           |(int(ord(final[7])) << 8)
-                           |(int(ord(final[13]))), 4)
-
-    passwd = passwd + to64((int(ord(final[2])) << 16)
-                           |(int(ord(final[8])) << 8)
-                           |(int(ord(final[14]))), 4)
-
-    passwd = passwd + to64((int(ord(final[3])) << 16)
-                           |(int(ord(final[9])) << 8)
-                           |(int(ord(final[15]))), 4)
-
-    passwd = passwd + to64((int(ord(final[4])) << 16)
-                           |(int(ord(final[10])) << 8)
-                           |(int(ord(final[5]))), 4)
-
-    passwd = passwd + to64((int(ord(final[11]))), 2)
-
-
-    return magic + salt + '$' + passwd
-
-
-## assign a wrapper function:
-md5crypt = unix_md5_crypt
-
-if __name__ == "__main__":
-    print unix_md5_crypt("cat", "hat")

=== modified file 'landscape/lib/network.py'
--- landscape/lib/network.py	2013-05-20 08:22:52 +0000
+++ landscape/lib/network.py	2017-03-10 15:29:37 +0000
@@ -8,6 +8,8 @@
 import errno
 import logging
 
+from twisted.python.compat import long
+
 __all__ = ["get_active_device_info", "get_network_traffic", "is_64"]
 
 # from header /usr/include/bits/ioctls.h

=== modified file 'landscape/lib/persist.py'
--- landscape/lib/persist.py	2013-11-21 08:32:12 +0000
+++ landscape/lib/persist.py	2017-03-10 15:29:37 +0000
@@ -590,7 +590,7 @@
 class PickleBackend(Backend):
 
     def __init__(self):
-        import cPickle
+        from landscape.compat import cPickle
         self._pickle = cPickle
 
     def new(self):
@@ -614,21 +614,21 @@
 class BPickleBackend(Backend):
 
     def __init__(self):
-        from landscape.lib import bpickle
+        from landscape.compat import bpickle
         self._bpickle = bpickle
 
     def new(self):
         return {}
 
     def load(self, filepath):
-        file = open(filepath)
+        file = open(filepath, "r")
         try:
             return self._bpickle.loads(file.read())
         finally:
             file.close()
 
     def save(self, filepath, map):
-        file = open(filepath, "w")
+        file = open(filepath, "wb")
         try:
             file.write(self._bpickle.dumps(map))
         finally:

=== modified file 'landscape/lib/scriptcontent.py'
--- landscape/lib/scriptcontent.py	2009-08-23 07:05:22 +0000
+++ landscape/lib/scriptcontent.py	2017-03-10 15:29:37 +0000
@@ -1,11 +1,11 @@
 from landscape.lib.hashlib import md5
 
+
 def build_script(interpreter, code):
     """
     Concatenates a interpreter and script into an executable script.
     """
-    return "#!%s\n%s" % ((interpreter or u"").encode("utf-8"),
-                         (code or u"").encode("utf-8"))
+    return u"#!{}\n{}".format(interpreter or u"", code or u"")
 
 
 def generate_script_hash(script):

=== modified file 'landscape/lib/sequenceranges.py'
--- landscape/lib/sequenceranges.py	2013-09-12 13:14:20 +0000
+++ landscape/lib/sequenceranges.py	2017-03-10 15:29:37 +0000
@@ -1,3 +1,4 @@
+from twisted.python.compat import xrange
 
 
 class SequenceError(Exception):

=== modified file 'landscape/lib/sysstats.py'
--- landscape/lib/sysstats.py	2012-12-27 20:10:05 +0000
+++ landscape/lib/sysstats.py	2017-03-10 15:29:37 +0000
@@ -57,7 +57,8 @@
 def get_logged_in_users():
     result = getProcessOutputAndValue("who", ["-q"], env=os.environ)
 
-    def parse_output((stdout_data, stderr_data, status)):
+    def parse_output(args):
+        stdout_data, stderr_data, status = args
         if status != 0:
             raise CommandError(stderr_data)
         first_line = stdout_data.split("\n", 1)[0]

=== modified file 'landscape/lib/tests/test_amp.py'
--- landscape/lib/tests/test_amp.py	2016-05-25 19:52:32 +0000
+++ landscape/lib/tests/test_amp.py	2017-03-10 15:29:37 +0000
@@ -10,6 +10,9 @@
     MethodCallSender)
 from landscape.tests.helpers import LandscapeTest
 
+from unittest import skipIf
+from twisted.python.compat import _PY3
+
 
 class FakeTransport(object):
     """Accumulate written data into a list."""
@@ -619,6 +622,7 @@
         self.client.stopTrying()
         connector.disconnect()
 
+    @skipIf(_PY3, 'Takes long with Python3, probably unclean Reactor')
     @inlineCallbacks
     def test_retry(self):
         """
@@ -640,6 +644,7 @@
         self.client.stopTrying()
         connector.disconnect()
 
+    @skipIf(_PY3, 'Takes long with Python3, probably unclean Reactor')
     @inlineCallbacks
     def test_retry_with_method_call_error(self):
         """
@@ -661,6 +666,7 @@
         self.client.stopTrying()
         connector.disconnect()
 
+    @skipIf(_PY3, 'Takes long with Python3, probably unclean Reactor')
     @inlineCallbacks
     def test_wb_retry_with_while_still_disconnected(self):
         """
@@ -704,6 +710,7 @@
         self.client.stopTrying()
         connector.disconnect()
 
+    @skipIf(_PY3, 'Takes long with Python3, probably unclean Reactor')
     @inlineCallbacks
     def test_retry_with_many_method_calls(self):
         """

=== modified file 'landscape/lib/tests/test_bootstrap.py'
--- landscape/lib/tests/test_bootstrap.py	2016-06-15 17:49:11 +0000
+++ landscape/lib/tests/test_bootstrap.py	2017-03-10 15:29:37 +0000
@@ -52,10 +52,10 @@
 
     @patch("os.chmod")
     def test_mode(self, chmod):
-        file = self.bootstrap_class(self.path, mode=0644)
+        file = self.bootstrap_class(self.path, mode=0o644)
         file.bootstrap(my_var="my_var_value")
 
-        chmod.assert_called_with(self.real_path, 0644)
+        chmod.assert_called_with(self.real_path, 0o644)
 
     @patch("os.chmod")
     @patch("os.chown")
@@ -71,25 +71,25 @@
         getgrnam.return_value = Mock()
         getgrnam.return_value.gr_gid = 5678
 
-        file = self.bootstrap_class(self.path, "username", "group", 0644)
+        file = self.bootstrap_class(self.path, "username", "group", 0o644)
         file.bootstrap(my_var="my_var_value")
 
         getuid.assert_called_with()
         getpwnam.assert_called_with("username")
         getgrnam.assert_called_with("group")
         chown.assert_called_with(self.real_path, 1234, 5678)
-        chmod.assert_called_with(self.real_path, 0644)
+        chmod.assert_called_with(self.real_path, 0o644)
 
     @patch("os.chmod")
     @patch("os.getuid")
     def test_all_details_with_non_root(self, getuid, chmod):
         getuid.return_value = 1000
 
-        file = self.bootstrap_class(self.path, "username", "group", 0644)
+        file = self.bootstrap_class(self.path, "username", "group", 0o644)
         file.bootstrap(my_var="my_var_value")
 
         getuid.assert_called_with()
-        chmod.assert_called_with(self.real_path, 0644)
+        chmod.assert_called_with(self.real_path, 0o644)
 
 
 class BootstrapCreationTest(BootstrapPathTest):

=== modified file 'landscape/lib/tests/test_bpickle.py'
--- landscape/lib/tests/test_bpickle.py	2011-07-05 05:09:11 +0000
+++ landscape/lib/tests/test_bpickle.py	2017-03-10 15:29:37 +0000
@@ -1,6 +1,6 @@
 import unittest
 
-from landscape.lib import bpickle
+from landscape.compat import bpickle
 
 
 class BPickleTest(unittest.TestCase):

=== modified file 'landscape/lib/tests/test_disk.py'
--- landscape/lib/tests/test_disk.py	2016-06-15 18:21:36 +0000
+++ landscape/lib/tests/test_disk.py	2017-03-10 15:29:37 +0000
@@ -42,7 +42,8 @@
         f.write(content)
         f.close()
         for point in points:
-            self.stat_results[point] = (4096, 0, 1000, 500, 0, 0, 0, 0, 0)
+            self.stat_results[point] = os.statvfs_result(
+                (4096, 0, 1000, 500, 0, 0, 0, 0, 0, 0))
 
     def test_get_filesystem_for_path(self):
         self.set_mount_points(["/"])
@@ -51,7 +52,8 @@
 
     def test_get_filesystem_subpath(self):
         self.set_mount_points(["/"])
-        self.stat_results["/"] = (4096, 0, 1000, 500, 0, 0, 0, 0, 0)
+        self.stat_results["/"] = os.statvfs_result(
+            (4096, 0, 1000, 500, 0, 0, 0, 0, 0, 0))
         info = get_filesystem_for_path("/home", self.mount_file, self.statvfs)
         self.assertEqual(info["mount-point"], "/")
 
@@ -99,7 +101,8 @@
         f.write(content)
         f.close()
 
-        self.stat_results["/home"] = (4096, 0, 1000, 500, 0, 0, 0, 0, 0)
+        self.stat_results["/home"] = os.statvfs_result(
+            (4096, 0, 1000, 500, 0, 0, 0, 0, 0, 0))
 
         result = [x for x in get_mount_info(self.mount_file, self.statvfs)]
         expected = {"device": "/dev/sda1", "mount-point": "/home",

=== modified file 'landscape/lib/tests/test_fetch.py'
--- landscape/lib/tests/test_fetch.py	2016-08-04 16:13:11 +0000
+++ landscape/lib/tests/test_fetch.py	2017-03-10 15:29:37 +0000
@@ -4,6 +4,7 @@
 import pycurl
 
 from twisted.internet.defer import FirstError
+from twisted.python.compat import itervalues, unicode
 
 from landscape.lib.fetch import (
     fetch, fetch_async, fetch_many_async, fetch_to_files,
@@ -214,7 +215,7 @@
         curl = CurlStub("result", {pycurl.HTTP_CODE: 404})
         try:
             fetch("http://example.com", curl=curl)
-        except HTTPCodeError, error:
+        except HTTPCodeError as error:
             self.assertEqual(error.http_code, 404)
             self.assertEqual(error.body, "result")
         else:
@@ -232,7 +233,7 @@
         curl = CurlStub(error=pycurl.error(60, "pycurl error"))
         try:
             fetch("http://example.com", curl=curl)
-        except PyCurlError, error:
+        except PyCurlError as error:
             self.assertEqual(error.error_code, 60)
             self.assertEqual(error.message, "pycurl error")
         else:
@@ -418,7 +419,7 @@
         result = fetch_to_files(url_results.keys(), directory, curl=curl)
 
         def check_files(ignored):
-            for result in url_results.itervalues():
+            for result in itervalues(url_results):
                 fd = open(os.path.join(directory, result))
                 self.assertEqual(fd.read(), result)
                 fd.close()

=== modified file 'landscape/lib/tests/test_gpg.py'
--- landscape/lib/tests/test_gpg.py	2016-05-23 13:44:24 +0000
+++ landscape/lib/tests/test_gpg.py	2017-03-10 15:29:37 +0000
@@ -19,7 +19,7 @@
         gpg = self.makeFile("#!/bin/sh\n"
                             "touch $3/trustdb.gpg\n"
                             "echo -n $@ > %s\n" % gpg_options)
-        os.chmod(gpg, 0755)
+        os.chmod(gpg, 0o755)
         gpg_home = self.makeDir()
         deferred = Deferred()
 
@@ -48,7 +48,7 @@
         provided signature is not valid.
         """
         gpg = self.makeFile("#!/bin/sh\necho out; echo err >&2; exit 1\n")
-        os.chmod(gpg, 0755)
+        os.chmod(gpg, 0o755)
         gpg_home = self.makeDir()
         deferred = Deferred()
 

=== modified file 'landscape/lib/tests/test_network.py'
--- landscape/lib/tests/test_network.py	2016-06-15 17:38:24 +0000
+++ landscape/lib/tests/test_network.py	2017-03-10 15:29:37 +0000
@@ -2,14 +2,13 @@
 import socket
 
 from mock import patch, ANY
-
-from cStringIO import StringIO
 from subprocess import Popen, PIPE
+
 from landscape.tests.helpers import LandscapeTest
-
 from landscape.lib.network import (
     get_network_traffic, get_active_device_info, get_active_interfaces,
     get_fqdn, get_network_interface_speed)
+from landscape.compat import StringIO
 
 
 class NetworkInfoTest(LandscapeTest):

=== modified file 'landscape/lib/tests/test_process.py'
--- landscape/lib/tests/test_process.py	2016-06-15 17:28:14 +0000
+++ landscape/lib/tests/test_process.py	2017-03-10 15:29:37 +0000
@@ -42,7 +42,8 @@
 
     @mock.patch("landscape.lib.process.detect_jiffies", return_value=1)
     @mock.patch("os.listdir")
-    def test_missing_process_race(self, list_dir_mock, jiffies_mock):
+    @mock.patch("landscape.monitor.computeruptime.get_uptime")
+    def test_missing_process_race(self, get_uptime_mock, list_dir_mock, jiffies_mock):
         """
         We use os.listdir("/proc") to get the list of active processes, if a
         process ends before we attempt to read the process' information, then
@@ -68,9 +69,9 @@
                 self.closed = True
 
         list_dir_mock.return_value = ["12345"]
+        get_uptime_mock.return_value = 1.0
         fakefile1 = FakeFile("test-binary")
         fakefile2 = FakeFile(None)
-
         with mock.patch("__builtin__.open", mock.mock_open()) as open_mock:
             # This means "return fakefile1, then fakefile2"
             open_mock.side_effect = [fakefile1, fakefile2]

=== modified file 'landscape/lib/tests/test_sysstats.py'
--- landscape/lib/tests/test_sysstats.py	2012-12-27 20:10:05 +0000
+++ landscape/lib/tests/test_sysstats.py	2017-03-10 15:29:37 +0000
@@ -79,7 +79,7 @@
         who.write("echo '# users=%d'\n" % len(users.split()))
         who.close()
 
-        os.chmod(self.who_path, 0770)
+        os.chmod(self.who_path, 0o770)
 
 
 class LoggedInUsersTest(FakeWhoQTest):

=== modified file 'landscape/lib/tests/test_twisted_util.py'
--- landscape/lib/tests/test_twisted_util.py	2011-08-04 16:05:10 +0000
+++ landscape/lib/tests/test_twisted_util.py	2017-03-10 15:29:37 +0000
@@ -1,8 +1,11 @@
 import os
 
+from twisted.python.compat import _PY3
+from unittest import skipIf
+
+from landscape.lib.fs import create_file
+from landscape.lib.twisted_util import spawn_process
 from landscape.tests.helpers import LandscapeTest
-from landscape.lib.twisted_util import spawn_process
-from landscape.lib.fs import create_file
 
 
 class SpawnProcessTest(LandscapeTest):
@@ -10,7 +13,7 @@
     def setUp(self):
         super(SpawnProcessTest, self).setUp()
         self.command = self.makeFile("#!/bin/sh\necho -n $@")
-        os.chmod(self.command, 0755)
+        os.chmod(self.command, 0o755)
 
     def test_spawn_process_return_value(self):
         """
@@ -18,7 +21,8 @@
         """
         create_file(self.command, "#!/bin/sh\nexit 2")
 
-        def callback((out, err, code)):
+        def callback(args):
+            out, err, code = args
             self.assertEqual(out, "")
             self.assertEqual(err, "")
             self.assertEqual(code, 2)
@@ -31,7 +35,8 @@
         """
         The process returns the expected standard output.
         """
-        def callback((out, err, code)):
+        def callback(args):
+            out, err, code = args
             self.assertEqual(out, "a b")
             self.assertEqual(err, "")
             self.assertEqual(code, 0)
@@ -46,7 +51,8 @@
         """
         create_file(self.command, "#!/bin/sh\necho -n $@ >&2")
 
-        def callback((out, err, code)):
+        def callback(args):
+            out, err, code = args
             self.assertEqual(out, "")
             self.assertEqual(err, "a b")
             self.assertEqual(code, 0)
@@ -68,7 +74,8 @@
         def line_received(line):
             lines.append(line)
 
-        def callback((out, err, code)):
+        def callback(args):
+            out, err, code = args
             self.assertEqual(expected, lines)
 
         result = spawn_process(self.command, args=(param,),
@@ -88,7 +95,8 @@
         def line_received(line):
             lines.append(line)
 
-        def callback((out, err, code)):
+        def callback(args):
+            out, err, code = args
             self.assertEqual(expected, lines)
 
         result = spawn_process(self.command, args=(param,),
@@ -109,7 +117,8 @@
         def line_received(line):
             lines.append(line)
 
-        def callback((out, err, code)):
+        def callback(args):
+            out, err, code = args
             self.assertEqual(expected, lines)
 
         result = spawn_process(self.command, args=(param,),
@@ -117,13 +126,15 @@
         result.addCallback(callback)
         return result
 
+    @skipIf(_PY3, 'Takes long with Python3, probably unclean Reactor')
     def test_spawn_process_with_stdin(self):
         """
         Optionally C{spawn_process} accepts a C{stdin} argument.
         """
         create_file(self.command, "#!/bin/sh\n/bin/cat")
 
-        def callback((out, err, code)):
+        def callback(args):
+            out, err, code = args
             self.assertEqual("hello", out)
 
         result = spawn_process(self.command, stdin="hello")

=== modified file 'landscape/lib/twisted_util.py'
--- landscape/lib/twisted_util.py	2013-07-19 09:12:16 +0000
+++ landscape/lib/twisted_util.py	2017-03-10 15:29:37 +0000
@@ -2,8 +2,9 @@
 from twisted.internet.protocol import ProcessProtocol
 from twisted.internet.process import Process, ProcessReader
 from twisted.internet import reactor
+from twisted.python.compat import itervalues
 
-import cStringIO
+from landscape.compat import StringIO
 
 
 def gather_results(deferreds, consume_errors=False):
@@ -19,8 +20,8 @@
 
     def __init__(self, deferred, stdin=None, line_received=None):
         self.deferred = deferred
-        self.outBuf = cStringIO.StringIO()
-        self.errBuf = cStringIO.StringIO()
+        self.outBuf = StringIO()
+        self.errBuf = StringIO()
         self.errReceived = self.errBuf.write
         self.stdin = stdin
         self.line_received = line_received
@@ -103,7 +104,7 @@
                 be used in place of this workaround.
             """
             if process.pipes and not process.pid:
-                for pipe in process.pipes.itervalues():
+                for pipe in itervalues(process.pipes):
                     if isinstance(pipe, ProcessReader):
                         # Read whatever is left
                         pipe.doRead()

=== modified file 'landscape/manager/aptsources.py'
--- landscape/manager/aptsources.py	2017-01-11 15:44:41 +0000
+++ landscape/manager/aptsources.py	2017-03-10 15:29:37 +0000
@@ -86,9 +86,8 @@
         for key in message["gpg-keys"]:
             fd, path = tempfile.mkstemp()
             os.close(fd)
-            key_file = file(path, "w")
-            key_file.write(key)
-            key_file.close()
+            with open(path, "w") as key_file:
+                key_file.write(key)
             deferred.addCallback(
                 lambda ignore, path=path:
                     self._run_process("/usr/bin/apt-key", ["add", path]))
@@ -131,7 +130,7 @@
                                     "landscape-%s.list" % source["name"])
             with open(filename, "w") as sources_file:
                 sources_file.write(source["content"])
-            os.chmod(filename, 0644)
+            os.chmod(filename, 0o644)
         return self._run_reporter().addCallback(lambda ignored: None)
 
     def _run_reporter(self):

=== modified file 'landscape/manager/customgraph.py'
--- landscape/manager/customgraph.py	2013-05-21 14:18:29 +0000
+++ landscape/manager/customgraph.py	2017-03-10 15:29:37 +0000
@@ -3,7 +3,9 @@
 import logging
 
 from twisted.internet.defer import fail, DeferredList, succeed
+from twisted.python.compat import iteritems
 
+from landscape.compat import coerce_unicode
 from landscape.lib.scriptcontent import generate_script_hash
 from landscape.accumulate import Accumulator
 from landscape.manager.plugin import ManagerPlugin
@@ -129,7 +131,8 @@
             logging.error(u"Attempt to add graph with unknown user %s" %
                           user)
         else:
-            script_file = file(filename, "w")
+            script_file = open(filename, "w")
+            # file is closed in write_script_file
             self.write_script_file(
                 script_file, filename, shell, code, uid, gid)
             if graph_id in self._data:
@@ -158,7 +161,7 @@
         message = {"type": self.message_type, "data": self._data}
 
         new_data = {}
-        for graph_id, item in self._data.iteritems():
+        for graph_id, item in iteritems(self._data):
             script_hash = item["script-hash"]
             new_data[graph_id] = {
                 "values": [], "error": u"", "script-hash": script_hash}
@@ -186,7 +189,7 @@
         if graph_id not in self._data:
             return
         if failure.check(ProcessFailedError):
-            failure_value = failure.value.data.decode("utf-8")
+            failure_value = coerce_unicode(failure.value.data, "utf-8")
             if failure.value.exit_code:
                 failure_value = ("%s (process exited with code %d)" %
                                  (failure_value, failure.value.exit_code))
@@ -199,9 +202,8 @@
                 failure.value)
 
     def _get_script_hash(self, filename):
-        file_object = file(filename)
-        script_content = file_object.read()
-        file_object.close()
+        with open(filename) as file_object:
+            script_content = file_object.read()
         return generate_script_hash(script_content)
 
     def run(self):
@@ -235,7 +237,7 @@
                 self._data[graph_id]["script-hash"] = script_hash
             try:
                 uid, gid, path = get_user_info(user)
-            except UnknownUserError, e:
+            except UnknownUserError as e:
                 d = fail(e)
                 d.addErrback(self._handle_error, graph_id)
                 deferred_list.append(d)

=== modified file 'landscape/manager/keystonetoken.py'
--- landscape/manager/keystonetoken.py	2013-07-11 20:27:10 +0000
+++ landscape/manager/keystonetoken.py	2017-03-10 15:29:37 +0000
@@ -1,7 +1,7 @@
 import os
 import logging
-from ConfigParser import ConfigParser, NoOptionError
 
+from landscape.compat import ConfigParser, NoOptionError
 from landscape.monitor.plugin import DataWatcher
 from landscape.lib.persist import Persist
 

=== modified file 'landscape/manager/plugin.py'
--- landscape/manager/plugin.py	2013-05-08 22:18:47 +0000
+++ landscape/manager/plugin.py	2017-03-10 15:29:37 +0000
@@ -43,7 +43,8 @@
             log_failure(failure, msg=msg)
             return FAILED, text
 
-        def send((status, text)):
+        def send(args):
+            status, text = args
             result = {"type": "operation-result",
                       "status": status,
                       "operation-id": message["operation-id"]}

=== modified file 'landscape/manager/scriptexecution.py'
--- landscape/manager/scriptexecution.py	2016-10-06 11:02:53 +0000
+++ landscape/manager/scriptexecution.py	2017-03-10 15:29:37 +0000
@@ -12,13 +12,14 @@
 from twisted.internet.defer import (
     Deferred, fail, inlineCallbacks, returnValue, succeed)
 from twisted.internet.error import ProcessDone
+from twisted.python.compat import unicode, _PY3
 
 from landscape import VERSION
 from landscape.constants import UBUNTU_PATH
-from landscape.lib.scriptcontent import build_script
+from landscape.lib.encoding import encode_if_needed
 from landscape.lib.fetch import fetch_async, HTTPCodeError
 from landscape.lib.persist import Persist
-from landscape.lib.encoding import encode_if_needed
+from landscape.lib.scriptcontent import build_script
 from landscape.manager.plugin import ManagerPlugin, SUCCEEDED, FAILED
 
 
@@ -111,10 +112,14 @@
         # It would be nice to use fchown(2) and fchmod(2), but they're not
         # available in python and using it with ctypes is pretty tedious, not
         # to mention we can't get errno.
-        os.chmod(filename, 0700)
+        os.chmod(filename, 0o700)
         if uid is not None:
             os.chown(filename, uid, gid)
-        script_file.write(build_script(shell, code))
+
+        script = build_script(shell, code)
+        if not _PY3:
+            script = script.encode('utf-8')
+        script_file.write(script)
         script_file.close()
 
     def _run_script(self, filename, uid, gid, path, env, time_limit):
@@ -178,7 +183,7 @@
             d.addCallback(self._respond_success, opid)
             d.addErrback(self._respond_failure, opid)
             return d
-        except Exception, e:
+        except Exception as e:
             self._respond(FAILED, self._format_exception(e), opid)
             raise
 
@@ -223,13 +228,12 @@
                     cainfo=self.registry.config.ssl_public_key,
                     headers=headers)
             full_filename = os.path.join(attachment_dir, filename)
-            attachment = file(full_filename, "wb")
-            os.chmod(full_filename, 0600)
-            if uid is not None:
-                os.chown(full_filename, uid, gid)
-            attachment.write(data)
-            attachment.close()
-        os.chmod(attachment_dir, 0700)
+            with open(full_filename, "wb") as attachment:
+                os.chmod(full_filename, 0o600)
+                if uid is not None:
+                    os.chown(full_filename, uid, gid)
+                attachment.write(data)
+        os.chmod(attachment_dir, 0o700)
         if uid is not None:
             os.chown(attachment_dir, uid, gid)
         returnValue(attachment_dir)
@@ -270,7 +274,7 @@
         env = {"PATH": UBUNTU_PATH, "USER": user or "", "HOME": path or ""}
         if server_supplied_env:
             env.update(server_supplied_env)
-        old_umask = os.umask(0022)
+        old_umask = os.umask(0o022)
 
         if attachments:
             persist = Persist(

=== modified file 'landscape/manager/tests/test_aptsources.py'
--- landscape/manager/tests/test_aptsources.py	2017-01-13 15:49:40 +0000
+++ landscape/manager/tests/test_aptsources.py	2017-03-10 15:29:37 +0000
@@ -57,7 +57,7 @@
              "gpg-keys": [],
              "operation-id": 1})
 
-        with file(self.sourceslist.SOURCES_LIST) as sources:
+        with open(self.sourceslist.SOURCES_LIST) as sources:
             self.assertEqual(
                 "# Landscape manages repositories for this computer\n"
                 "# Original content of sources.list can be found in "
@@ -79,7 +79,7 @@
 
         saved_sources_path = "{}.save".format(self.sourceslist.SOURCES_LIST)
         self.assertTrue(os.path.exists(saved_sources_path))
-        with file(saved_sources_path) as saved_sources:
+        with open(saved_sources_path) as saved_sources:
             self.assertEqual("oki\n\ndoki\n#comment\n # other comment\n",
                              saved_sources.read())
 
@@ -102,7 +102,7 @@
              "operation-id": 1})
 
         self.assertTrue(os.path.exists(saved_sources_path))
-        with file(saved_sources_path) as saved_sources:
+        with open(saved_sources_path) as saved_sources:
             self.assertEqual("original content\n", saved_sources.read())
 
     def test_restore_sources_list(self):
@@ -123,7 +123,7 @@
              "gpg-keys": [],
              "operation-id": 1})
 
-        with file(self.sourceslist.SOURCES_LIST) as sources:
+        with open(self.sourceslist.SOURCES_LIST) as sources:
             self.assertEqual("original content\n", sources.read())
 
     def test_sources_list_permissions(self):
@@ -236,12 +236,16 @@
         dev_file = os.path.join(self.sourceslist.SOURCES_LIST_D,
                                 "landscape-dev.list")
         self.assertTrue(os.path.exists(dev_file))
-        self.assertEqual("oki\n", file(dev_file).read())
+        with open(dev_file) as file:
+            result = file.read()
+        self.assertEqual("oki\n", result)
 
         lucid_file = os.path.join(self.sourceslist.SOURCES_LIST_D,
                                   "landscape-lucid.list")
         self.assertTrue(os.path.exists(lucid_file))
-        self.assertEqual("doki\n", file(lucid_file).read())
+        with open(lucid_file) as file:
+            result = file.read()
+        self.assertEqual("doki\n", result)
 
     def test_import_gpg_keys(self):
         """
@@ -254,7 +258,9 @@
             self.assertEqual("/usr/bin/apt-key", command)
             self.assertEqual("add", args[0])
             filename = args[1]
-            self.assertEqual("Some key content", file(filename).read())
+            with open(filename) as file:
+                result = file.read()
+            self.assertEqual("Some key content", result)
             deferred.callback(("ok", "", 0))
             return deferred
 
@@ -376,17 +382,17 @@
 
         self.sourceslist._run_process = _run_process
 
-        sources = file(self.sourceslist.SOURCES_LIST, "w")
-        sources.write("oki\n\ndoki\n#comment\n")
-        sources.close()
+        with open(self.sourceslist.SOURCES_LIST, "w") as sources:
+            sources.write("oki\n\ndoki\n#comment\n")
 
         self.manager.dispatch_message(
             {"type": "apt-sources-replace", "sources": [], "gpg-keys": ["key"],
              "operation-id": 1})
 
-        self.assertEqual(
-            "oki\n\ndoki\n#comment\n",
-            file(self.sourceslist.SOURCES_LIST).read())
+        with open(self.sourceslist.SOURCES_LIST) as sources_list:
+            result = sources_list.read()
+
+        self.assertEqual("oki\n\ndoki\n#comment\n", result)
 
         return deferred
 

=== modified file 'landscape/manager/tests/test_customgraph.py'
--- landscape/manager/tests/test_customgraph.py	2016-06-15 23:35:19 +0000
+++ landscape/manager/tests/test_customgraph.py	2017-03-10 15:29:37 +0000
@@ -105,7 +105,7 @@
                    "bar")])
 
         mock_chown.assert_called_with(mock.ANY, 1234, 5678)
-        mock_chmod.assert_called_with(mock.ANY, 0700)
+        mock_chmod.assert_called_with(mock.ANY, 0o700)
         mock_getpwnam.assert_called_with("bar")
 
     def test_remove_unknown_graph(self):
@@ -114,10 +114,7 @@
                      "graph-id": 123})
 
     def test_remove_graph(self):
-        filename = self.makeFile()
-        tempfile = file(filename, "w")
-        tempfile.write("foo")
-        tempfile.close()
+        filename = self.makeFile(content='foo')
         self.store.add_graph(123, filename, u"user")
         self.manager.dispatch_message(
             {"type": "custom-graph-remove",
@@ -125,11 +122,8 @@
         self.assertFalse(os.path.exists(filename))
 
     def test_run(self):
-        filename = self.makeFile()
-        tempfile = file(filename, "w")
-        tempfile.write("#!/bin/sh\necho 1")
-        tempfile.close()
-        os.chmod(filename, 0777)
+        filename = self.makeFile(content="#!/bin/sh\necho 1")
+        os.chmod(filename, 0o777)
         self.store.add_graph(123, filename, None)
 
         def check(ignore):
@@ -144,18 +138,12 @@
         return self.graph_manager.run().addCallback(check)
 
     def test_run_multiple(self):
-        filename = self.makeFile()
-        tempfile = file(filename, "w")
-        tempfile.write("#!/bin/sh\necho 1")
-        tempfile.close()
-        os.chmod(filename, 0777)
+        filename = self.makeFile(content="#!/bin/sh\necho 1")
+        os.chmod(filename, 0o777)
         self.store.add_graph(123, filename, None)
 
-        filename = self.makeFile()
-        tempfile = file(filename, "w")
-        tempfile.write("#!/bin/sh\necho 2")
-        tempfile.close()
-        os.chmod(filename, 0777)
+        filename = self.makeFile(content="#!/bin/sh\necho 2")
+        os.chmod(filename, 0o777)
         self.store.add_graph(124, filename, None)
 
         def check(ignore):
@@ -176,11 +164,8 @@
         return self.graph_manager.run().addCallback(check)
 
     def test_run_with_nonzero_exit_code(self):
-        filename = self.makeFile()
-        tempfile = file(filename, "w")
-        tempfile.write("#!/bin/sh\nexit 1")
-        tempfile.close()
-        os.chmod(filename, 0777)
+        filename = self.makeFile(content="#!/bin/sh\nexit 1")
+        os.chmod(filename, 0o777)
         self.store.add_graph(123, filename, None)
 
         def check(ignore):

=== modified file 'landscape/manager/tests/test_packagemanager.py'
--- landscape/manager/tests/test_packagemanager.py	2016-06-16 16:59:17 +0000
+++ landscape/manager/tests/test_packagemanager.py	2017-03-10 15:29:37 +0000
@@ -186,7 +186,7 @@
         when passed the L{PackageChanger} class as argument.
         """
         command = self.makeFile("#!/bin/sh\necho 'I am the changer!' >&2\n")
-        os.chmod(command, 0755)
+        os.chmod(command, 0o755)
         find_command_mock.return_value = command
 
         self.package_store.add_task("changer", "Do something!")
@@ -210,7 +210,7 @@
         when passed the L{ReleaseUpgrader} class as argument.
         """
         command = self.makeFile("#!/bin/sh\necho 'I am the upgrader!' >&2\n")
-        os.chmod(command, 0755)
+        os.chmod(command, 0o755)
         find_command_mock.return_value = command
 
         self.package_store.add_task("release-upgrader", "Do something!")
@@ -244,7 +244,7 @@
     @mock.patch("landscape.package.changer.find_changer_command")
     def test_spawn_handler_copies_environment(self, find_command_mock):
         command = self.makeFile("#!/bin/sh\necho VAR: $VAR\n")
-        os.chmod(command, 0755)
+        os.chmod(command, 0o755)
         find_command_mock.return_value = command
 
         self.manager.add(self.package_manager)
@@ -264,7 +264,7 @@
     @mock.patch("landscape.package.changer.find_changer_command")
     def test_spawn_handler_passes_quiet_option(self, find_command_mock):
         command = self.makeFile("#!/bin/sh\necho OPTIONS: $@\n")
-        os.chmod(command, 0755)
+        os.chmod(command, 0o755)
         find_command_mock.return_value = command
 
         self.manager.add(self.package_manager)
@@ -281,7 +281,7 @@
 
     def test_spawn_handler_wont_run_without_tasks(self):
         command = self.makeFile("#!/bin/sh\necho RUN!\n")
-        os.chmod(command, 0755)
+        os.chmod(command, 0o755)
 
         self.manager.add(self.package_manager)
         result = self.package_manager.spawn_handler(PackageChanger)
@@ -295,7 +295,7 @@
     @mock.patch("landscape.package.changer.find_changer_command")
     def test_spawn_handler_doesnt_chdir(self, find_command_mock):
         command = self.makeFile("#!/bin/sh\necho RUN\n")
-        os.chmod(command, 0755)
+        os.chmod(command, 0o755)
         cwd = os.getcwd()
         self.addCleanup(os.chdir, cwd)
         dir = self.makeDir()
@@ -313,7 +313,7 @@
             log = self.logfile.getvalue()
             self.assertIn("RUN", log)
             # restore permissions to the dir so tearDown can clean it up
-            os.chmod(dir, 0766)
+            os.chmod(dir, 0o766)
 
         return result.addCallback(got_result)
 

=== modified file 'landscape/manager/tests/test_scriptexecution.py'
--- landscape/manager/tests/test_scriptexecution.py	2016-10-24 10:59:47 +0000
+++ landscape/manager/tests/test_scriptexecution.py	2017-03-10 15:29:37 +0000
@@ -6,9 +6,12 @@
 
 import mock
 
+from unittest import skipIf
+
 from twisted.internet.defer import gatherResults, succeed, fail
 from twisted.internet.error import ProcessDone
 from twisted.python.failure import Failure
+from twisted.python.compat import _PY3
 
 from landscape import VERSION
 from landscape.lib.fetch import HTTPCodeError
@@ -40,6 +43,7 @@
         self.plugin = ScriptExecutionPlugin()
         self.manager.add(self.plugin)
 
+    @skipIf(_PY3, 'Takes long with Python3, probably not an unclean Reactor')
     def test_basic_run(self):
         """
         The plugin returns a Deferred resulting in the output of basic
@@ -49,18 +53,21 @@
         result.addCallback(self.assertEqual, "hi\n")
         return result
 
+    @skipIf(_PY3, 'Takes long with Python3, probably not an unclean Reactor')
     def test_snap_path(self):
         """The bin path for snaps is included in the PATH."""
         deferred = self.plugin.run_script("/bin/sh", "echo $PATH")
         return deferred.addCallback(
             lambda result: self.assertIn("/snap/bin", result))
 
+    @skipIf(_PY3, 'Takes long with Python3, probably not an unclean Reactor')
     def test_other_interpreter(self):
         """Non-shell interpreters can be specified."""
         result = self.plugin.run_script("/usr/bin/python", "print 'hi'")
         result.addCallback(self.assertEqual, "hi\n")
         return result
 
+    @skipIf(_PY3, 'Takes long with Python3, probably not an unclean Reactor')
     def test_other_interpreter_env(self):
         """
         Non-shell interpreters don't have their paths set by the shell, so we
@@ -77,6 +84,7 @@
         result.addCallback(check_environment)
         return result
 
+    @skipIf(_PY3, 'Takes long with Python3, probably not an unclean Reactor')
     def test_server_supplied_env(self):
         """
         Server-supplied environment variables are merged with default
@@ -98,6 +106,7 @@
         result.addCallback(check_environment)
         return result
 
+    @skipIf(_PY3, 'Takes long with Python3, probably not an unclean Reactor')
     def test_server_supplied_env_overrides_client(self):
         """
         Server-supplied environment variables override client default
@@ -118,6 +127,7 @@
         result.addCallback(check_environment)
         return result
 
+    @skipIf(_PY3, 'Takes long with Python3, probably not an unclean Reactor')
     def test_concurrent(self):
         """
         Scripts run with the ScriptExecutionPlugin plugin are run concurrently.
@@ -134,6 +144,7 @@
         d2.addCallback(self.assertEqual, "")
         return gatherResults([d1, d2])
 
+    @skipIf(_PY3, 'Takes long with Python3, probably not an unclean Reactor')
     def test_accented_run_in_code(self):
         """
         Scripts can contain accented data both in the code and in the
@@ -146,6 +157,7 @@
             self.assertEqual, "%s\n" % (accented_content.encode("utf-8"),))
         return result
 
+    @skipIf(_PY3, 'Takes long with Python3, probably not an unclean Reactor')
     def test_accented_run_in_interpreter(self):
         """
         Scripts can also contain accents in the interpreter.
@@ -161,9 +173,10 @@
         result.addCallback(check)
         return result
 
+    @skipIf(_PY3, 'Takes long with Python3, probably not an unclean Reactor')
     def test_set_umask_appropriately(self):
         """
-        We should be setting the umask to 0022 before executing a script, and
+        We should be setting the umask to 0o022 before executing a script, and
         restoring it to the previous value when finishing.
         """
         # Get original umask.
@@ -183,6 +196,7 @@
         result.addCallback(check)
         return result.addCallback(lambda _: patch_umask.stop())
 
+    @skipIf(_PY3, "mock does not get cleaned up, poisoning all other tests.")
     def test_restore_umask_in_event_of_error(self):
         """
         We set the umask before executing the script, in the event that there's
@@ -298,6 +312,7 @@
 
         return result.addCallback(check).addBoth(cleanup)
 
+    @skipIf(_PY3, 'Takes long with Python3, probably not an unclean Reactor')
     def test_self_remove_script(self):
         """
         If a script removes itself, it doesn't create an error when the script
@@ -416,9 +431,9 @@
         spawn = factory.spawns[0]
         self.assertIn("LANDSCAPE_ATTACHMENTS", spawn[3])
         attachment_dir = spawn[3]["LANDSCAPE_ATTACHMENTS"]
-        self.assertEqual(stat.S_IMODE(os.stat(attachment_dir).st_mode), 0700)
+        self.assertEqual(stat.S_IMODE(os.stat(attachment_dir).st_mode), 0o700)
         filename = os.path.join(attachment_dir, "file 1")
-        self.assertEqual(stat.S_IMODE(os.stat(filename).st_mode), 0600)
+        self.assertEqual(stat.S_IMODE(os.stat(filename).st_mode), 0o600)
 
         protocol = spawn[0]
         protocol.childDataReceived(1, "foobar")

=== modified file 'landscape/manager/usermanager.py'
--- landscape/manager/usermanager.py	2013-05-07 23:06:56 +0000
+++ landscape/manager/usermanager.py	2017-03-10 15:29:37 +0000
@@ -62,7 +62,7 @@
                     if len(parts) > 1:
                         if parts[1].startswith("!"):
                             locked_users.append(parts[0].strip())
-            except IOError, e:
+            except IOError as e:
                 logging.error("Error reading shadow file. %s" % e)
         return locked_users
 

=== modified file 'landscape/monitor/activeprocessinfo.py'
--- landscape/monitor/activeprocessinfo.py	2013-07-12 09:49:47 +0000
+++ landscape/monitor/activeprocessinfo.py	2017-03-10 15:29:37 +0000
@@ -1,5 +1,7 @@
 import subprocess
 
+from twisted.python.compat import itervalues
+
 from landscape.diff import diff
 from landscape.lib.process import ProcessInformation
 from landscape.lib.jiffies import detect_jiffies
@@ -67,11 +69,11 @@
         processes = self._get_processes()
         creates, updates, deletes = diff(self._persist_processes, processes)
         if creates:
-            changes["add-processes"] = list(creates.itervalues())
+            changes["add-processes"] = list(itervalues(creates))
         if updates:
-            changes["update-processes"] = list(updates.itervalues())
+            changes["update-processes"] = list(itervalues(updates))
         if deletes:
-            changes["kill-processes"] = list(deletes.iterkeys())
+            changes["kill-processes"] = list(deletes)
 
         # Update cached values for use on the next run.
         self._previous_processes = processes

=== modified file 'landscape/monitor/aptpreferences.py'
--- landscape/monitor/aptpreferences.py	2013-07-05 12:52:40 +0000
+++ landscape/monitor/aptpreferences.py	2017-03-10 15:29:37 +0000
@@ -1,5 +1,7 @@
 import os
 
+from twisted.python.compat import iteritems, unicode
+
 from landscape.lib.fs import read_file
 from landscape.constants import APT_PREFERENCES_SIZE_LIMIT
 
@@ -46,7 +48,7 @@
             return None
 
         item_size_limit = self.size_limit / len(data.keys())
-        for filename, contents in data.iteritems():
+        for filename, contents in iteritems(data):
             if len(filename) + len(contents) > item_size_limit:
                 truncated_contents_size = item_size_limit - len(filename)
                 data[filename] = data[filename][0:truncated_contents_size]

=== modified file 'landscape/monitor/cephusage.py'
--- landscape/monitor/cephusage.py	2014-05-20 14:20:21 +0000
+++ landscape/monitor/cephusage.py	2017-03-10 15:29:37 +0000
@@ -3,6 +3,7 @@
 import os
 
 from twisted.internet import threads
+from twisted.python.compat import unicode
 
 from landscape.accumulate import Accumulator
 from landscape.lib.monitor import CoverageMonitor

=== modified file 'landscape/monitor/computeruptime.py'
--- landscape/monitor/computeruptime.py	2013-07-05 12:52:40 +0000
+++ landscape/monitor/computeruptime.py	2017-03-10 15:29:37 +0000
@@ -12,7 +12,8 @@
     This parses a file in /proc/uptime format and returns a floating point
     version of the first value (the actual uptime).
     """
-    data = file(uptime_file, "r").readline()
+    with open(uptime_file, 'r') as ufile:
+        data = ufile.readline()
     up, idle = data.split()
     return float(up)
 
@@ -86,21 +87,22 @@
     def get_times(self):
         reboot_times = []
         shutdown_times = []
-        reader = LoginInfoReader(file(self._filename))
-        self._last_boot = self._boots_newer_than
-        self._last_shutdown = self._shutdowns_newer_than
+        with open(self._filename) as login_info_file:
+            reader = LoginInfoReader(login_info_file)
+            self._last_boot = self._boots_newer_than
+            self._last_shutdown = self._shutdowns_newer_than
 
-        for info in reader.login_info():
-            if info.tty_device.startswith("~"):
-                timestamp = to_timestamp(info.entry_time)
-                if (info.username == "reboot"
-                    and timestamp > self._last_boot):
-                    reboot_times.append(timestamp)
-                    self._last_boot = timestamp
-                elif (info.username == "shutdown"
-                      and timestamp > self._last_shutdown):
-                    shutdown_times.append(timestamp)
-                    self._last_shutdown = timestamp
+            for info in reader.login_info():
+                if info.tty_device.startswith("~"):
+                    timestamp = to_timestamp(info.entry_time)
+                    if (info.username == "reboot" and
+                            timestamp > self._last_boot):
+                        reboot_times.append(timestamp)
+                        self._last_boot = timestamp
+                    elif (info.username == "shutdown" and
+                            timestamp > self._last_shutdown):
+                        shutdown_times.append(timestamp)
+                        self._last_shutdown = timestamp
         return reboot_times, shutdown_times
 
     def get_last_boot_time(self):

=== modified file 'landscape/monitor/mountinfo.py'
--- landscape/monitor/mountinfo.py	2013-07-05 12:52:40 +0000
+++ landscape/monitor/mountinfo.py	2017-03-10 15:29:37 +0000
@@ -1,9 +1,10 @@
+import codecs
 import time
 import os
 
+from landscape.accumulate import Accumulator
 from landscape.lib.disk import get_mount_info, is_device_removable
 from landscape.lib.monitor import CoverageMonitor
-from landscape.accumulate import Accumulator
 from landscape.monitor.plugin import MonitorPlugin
 
 
@@ -134,7 +135,7 @@
         for line in file:
             try:
                 device, mount_point, filesystem, options = line.split()[:4]
-                mount_point = mount_point.decode("string-escape")
+                mount_point = codecs.decode(mount_point, "unicode_escape")
             except ValueError:
                 continue
             if "bind" in options.split(","):

=== modified file 'landscape/monitor/rebootrequired.py'
--- landscape/monitor/rebootrequired.py	2013-07-05 12:52:40 +0000
+++ landscape/monitor/rebootrequired.py	2017-03-10 15:29:37 +0000
@@ -35,7 +35,7 @@
             return []
 
         lines = read_file(self._packages_filename).splitlines()
-        packages = set(line.strip().decode("utf-8") for line in lines if line)
+        packages = set(line.strip() for line in lines if line)
         return sorted(packages)
 
     def _create_message(self):

=== modified file 'landscape/monitor/tests/test_aptpreferences.py'
--- landscape/monitor/tests/test_aptpreferences.py	2016-06-15 21:58:09 +0000
+++ landscape/monitor/tests/test_aptpreferences.py	2017-03-10 15:29:37 +0000
@@ -1,6 +1,8 @@
 import os
 import mock
 
+from twisted.python.compat import unicode
+
 from landscape.monitor.aptpreferences import AptPreferences
 from landscape.tests.helpers import LandscapeTest
 from landscape.tests.helpers import MonitorHelper

=== modified file 'landscape/monitor/tests/test_cephusage.py'
--- landscape/monitor/tests/test_cephusage.py	2016-08-17 20:33:47 +0000
+++ landscape/monitor/tests/test_cephusage.py	2017-03-10 15:29:37 +0000
@@ -141,7 +141,7 @@
         reached.
         """
         interval = 300
-        stats = {"kb": 10240L, "kb_avail": 8192L, "kb_used": 2048L}
+        stats = {"kb": 10240, "kb_avail": 8192, "kb_used": 2048}
 
         plugin = CephUsage(
             create_time=self.reactor.time, interval=interval,

=== modified file 'landscape/monitor/tests/test_mountinfo.py'
--- landscape/monitor/tests/test_mountinfo.py	2017-02-22 10:55:15 +0000
+++ landscape/monitor/tests/test_mountinfo.py	2017-03-10 15:29:37 +0000
@@ -1,6 +1,10 @@
 import mock
+import os
 import tempfile
 
+from twisted.python.compat import StringType as basestring
+from twisted.python.compat import long
+
 from landscape.monitor.mountinfo import MountInfo
 from landscape.tests.helpers import LandscapeTest, mock_counter, MonitorHelper
 
@@ -8,6 +12,11 @@
 mb = lambda x: x * 1024 * 1024
 
 
+def statvfs_result_fixture(path):
+    """Fixture for a dummy statvfs_result."""
+    return os.statvfs_result((4096, 0, mb(1000), mb(100), 0, 0, 0, 0, 0, 0))
+
+
 class MountInfoTest(LandscapeTest):
     """Tests for mount-info plugin."""
 
@@ -24,7 +33,8 @@
         if "mtab_file" not in kwargs:
             kwargs["mtab_file"] = self.makeFile("/dev/hda1 / ext3 rw 0 0\n")
         if "statvfs" not in kwargs:
-            kwargs["statvfs"] = lambda path: (0,) * 1000
+            kwargs["statvfs"] = lambda path: os.statvfs_result(
+                (0, 0, 0, 0, 0, 0, 0, 0, 0, 0))
         plugin = MountInfo(*args, **kwargs)
         # To make sure tests are isolated from the real system by default.
         plugin.is_device_removable = lambda x: False
@@ -65,9 +75,11 @@
         """
         def statvfs(path):
             if path == "/":
-                return (4096, 0, mb(1000L), mb(100L), 0L, 0L, 0L, 0, 0)
+                return os.statvfs_result(
+                    (4096, 0, mb(1000), mb(100), 0, 0, 0, 0, 0, 0))
             else:
-                return (4096, 0, mb(10000L), mb(1000L), 0L, 0L, 0L, 0, 0)
+                return os.statvfs_result(
+                    (4096, 0, mb(10000), mb(1000), 0, 0, 0, 0, 0, 0))
 
         filename = self.makeFile("""\
 rootfs / rootfs rw 0 0
@@ -138,7 +150,8 @@
         function which should cause it to queue new messages.
         """
         def statvfs(path, multiplier=mock_counter(1).next):
-            return (4096, 0, mb(multiplier() * 1000), mb(100), 0, 0, 0, 0, 0)
+            return os.statvfs_result(
+                (4096, 0, mb(multiplier() * 1000), mb(100), 0, 0, 0, 0, 0, 0))
 
         plugin = self.get_mount_info(
             statvfs=statvfs, create_time=self.reactor.time,
@@ -170,8 +183,10 @@
         """
         def statvfs(path, multiplier=mock_counter(1).next):
             if path == "/":
-                return (4096, 0, mb(1000), mb(100), 0, 0, 0, 0, 0)
-            return (4096, 0, mb(multiplier() * 1000), mb(100), 0, 0, 0, 0, 0)
+                return os.statvfs_result(
+                    (4096, 0, mb(1000), mb(100), 0, 0, 0, 0, 0, 0))
+            return os.statvfs_result(
+                (4096, 0, mb(multiplier() * 1000), mb(100), 0, 0, 0, 0, 0, 0))
 
         filename = self.makeFile("""\
 /dev/hda1 / ext3 rw 0 0
@@ -213,11 +228,8 @@
         messages collected bewteen exchange periods should be
         delivered in a single message.
         """
-        def statvfs(path):
-            return (4096, 0, mb(1000), mb(100), 0, 0, 0, 0, 0)
-
         plugin = self.get_mount_info(
-            statvfs=statvfs, create_time=self.reactor.time)
+            statvfs=statvfs_result_fixture, create_time=self.reactor.time)
         step_size = self.monitor.step_size
         self.monitor.add(plugin)
 
@@ -244,11 +256,8 @@
         Duplicate message should never be created.  If no data is
         available, None will be returned when messages are created.
         """
-        def statvfs(path):
-            return (4096, 0, mb(1000), mb(100), 0, 0, 0, 0, 0)
-
         plugin = self.get_mount_info(
-            statvfs=statvfs, create_time=self.reactor.time)
+            statvfs=statvfs_result_fixture, create_time=self.reactor.time)
         self.monitor.add(plugin)
 
         self.reactor.advance(self.monitor.step_size)
@@ -266,16 +275,14 @@
         really test anything since the current behaviour is to ignore
         any mount point for which the device doesn't start with /dev.
         """
-        def statvfs(path):
-            return (4096, 0, mb(1000), mb(100), 0, 0, 0, 0, 0)
-
         filename = self.makeFile("""\
 /dev/hdc4 /mm xfs rw 0 0
 /mm/ubuntu-mirror /home/dchroot/warty/mirror none bind 0 0
 /mm/ubuntu-mirror /home/dchroot/hoary/mirror none bind 0 0
 /mm/ubuntu-mirror /home/dchroot/breezy/mirror none bind 0 0
 """)
-        plugin = self.get_mount_info(mounts_file=filename, statvfs=statvfs,
+        plugin = self.get_mount_info(mounts_file=filename,
+                                     statvfs=statvfs_result_fixture,
                                      create_time=self.reactor.time,
                                      mtab_file=filename)
         step_size = self.monitor.step_size
@@ -327,7 +334,8 @@
     def test_sample_free_space(self):
         """Test collecting information about free space."""
         def statvfs(path, multiplier=mock_counter(1).next):
-            return (4096, 0, mb(1000), mb(multiplier() * 100), 0, 0, 0, 0, 0)
+            return os.statvfs_result(
+                (4096, 0, mb(1000), mb(multiplier() * 100), 0, 0, 0, 0, 0, 0))
 
         plugin = self.get_mount_info(
             statvfs=statvfs, create_time=self.reactor.time)
@@ -362,13 +370,11 @@
         Test ensures all expected messages are created and contain the
         right datatypes.
         """
-        def statvfs(path):
-            return (4096, 0, mb(1000), mb(100), 0, 0, 0, 0, 0)
-
         filename = self.makeFile("""\
 /dev/hda2 / xfs rw 0 0
 """)
-        plugin = self.get_mount_info(mounts_file=filename, statvfs=statvfs,
+        plugin = self.get_mount_info(mounts_file=filename,
+                                     statvfs=statvfs_result_fixture,
                                      create_time=self.reactor.time,
                                      mtab_file=filename)
         step_size = self.monitor.step_size
@@ -393,10 +399,8 @@
         On the reactor "resynchronize" event, new mount-info messages
         should be sent.
         """
-        def statvfs(path):
-            return (4096, 0, mb(1000), mb(100), 0, 0, 0, 0, 0)
         plugin = self.get_mount_info(
-            create_time=self.reactor.time, statvfs=statvfs)
+            create_time=self.reactor.time, statvfs=statvfs_result_fixture)
         self.monitor.add(plugin)
 
         plugin.run()
@@ -420,9 +424,6 @@
         shouldn't be listed, as they have the same free space/used space as the
         device they're bound to.
         """
-        def statvfs(path):
-            return (4096, 0, mb(1000), mb(100), 0, 0, 0, 0, 0)
-
         # From this test data, we expect only two mount points to be returned,
         # and the other two to be ignored (the rebound /dev/hda2 -> /mnt
         # mounting)
@@ -439,19 +440,20 @@
 /opt /mnt none rw,bind 0 0
 /opt /media/Boot\\040OSX none rw,bind 0 0
 """)
-        plugin = MountInfo(mounts_file=filename, create_time=self.reactor.time,
-                           statvfs=statvfs, mtab_file=mtab_filename)
+        plugin = MountInfo(
+            mounts_file=filename, create_time=self.reactor.time,
+            statvfs=statvfs_result_fixture, mtab_file=mtab_filename)
 
         self.monitor.add(plugin)
         plugin.run()
         message = plugin.create_mount_info_message()
         self.assertEqual(message.get("mount-info"),
                          [(0, {"device": "/dev/devices/by-uuid/12345567",
-                               "mount-point": "/", "total-space": 4096000L,
+                               "mount-point": "/", "total-space": 4096000,
                                "filesystem": "ext3"}),
                           (0, {"device": "/dev/hda2",
                                "mount-point": "/usr",
-                               "total-space": 4096000L,
+                               "total-space": 4096000,
                                "filesystem": "ext3"}),
                           ])
 
@@ -461,9 +463,6 @@
         bind mounted directories, so any filesystems in /proc/mounts will be
         reported.
         """
-        def statvfs(path):
-            return (4096, 0, mb(1000), mb(100), 0, 0, 0, 0, 0)
-
         # In this test, we expect all mount points to be returned, as we can't
         # identify any as bind mounts.
         filename = self.makeFile("""\
@@ -474,22 +473,23 @@
         # mktemp isn't normally secure, due to race conditions, but in this
         # case, we don't actually create the file at all.
         mtab_filename = tempfile.mktemp()
-        plugin = MountInfo(mounts_file=filename, create_time=self.reactor.time,
-                           statvfs=statvfs, mtab_file=mtab_filename)
+        plugin = MountInfo(
+            mounts_file=filename, create_time=self.reactor.time,
+            statvfs=statvfs_result_fixture, mtab_file=mtab_filename)
         self.monitor.add(plugin)
         plugin.run()
         message = plugin.create_mount_info_message()
         self.assertEqual(message.get("mount-info"),
                          [(0, {"device": "/dev/devices/by-uuid/12345567",
-                               "mount-point": "/", "total-space": 4096000L,
+                               "mount-point": "/", "total-space": 4096000,
                                "filesystem": "ext3"}),
                           (0, {"device": "/dev/hda2",
                                "mount-point": "/usr",
-                               "total-space": 4096000L,
+                               "total-space": 4096000,
                                "filesystem": "ext3"}),
                           (0, {"device": "/dev/devices/by-uuid/12345567",
                                "mount-point": "/mnt",
-                               "total-space": 4096000L,
+                               "total-space": 4096000,
                                "filesystem": "ext3"})])
 
     def test_no_message_if_not_accepted(self):
@@ -498,10 +498,6 @@
         accepting their type.
         """
         self.mstore.set_accepted_types([])
-
-        def statvfs(path):
-            return (4096, 0, mb(1000), mb(100), 0, 0, 0, 0, 0)
-
         # From this test data, we expect only two mount points to be returned,
         # and the third to be ignored (the rebound /dev/hda2 -> /mnt mounting)
         filename = self.makeFile("""\
@@ -516,8 +512,9 @@
 /opt /mnt none rw,bind 0 0
 """)
 
-        plugin = MountInfo(mounts_file=filename, create_time=self.reactor.time,
-                           statvfs=statvfs, mtab_file=mtab_filename)
+        plugin = MountInfo(
+            mounts_file=filename, create_time=self.reactor.time,
+            statvfs=statvfs_result_fixture, mtab_file=mtab_filename)
         self.monitor.add(plugin)
         self.reactor.advance(self.monitor.step_size * 2)
         self.monitor.exchange()
@@ -547,14 +544,12 @@
         didn't get the mount info at all. This test ensures that mount info are
         only saved when exchange happens.
         """
-        def statvfs(path):
-            return (4096, 0, mb(1000), mb(100), 0, 0, 0, 0, 0)
-
         filename = self.makeFile("""\
 /dev/hda1 / ext3 rw 0 0
 """)
-        plugin = MountInfo(mounts_file=filename, create_time=self.reactor.time,
-                           statvfs=statvfs, mtab_file=filename)
+        plugin = MountInfo(
+            mounts_file=filename, create_time=self.reactor.time,
+            statvfs=statvfs_result_fixture, mtab_file=filename)
         self.monitor.add(plugin)
         plugin.run()
         message1 = plugin.create_mount_info_message()
@@ -563,7 +558,7 @@
             [(0, {"device": "/dev/hda1",
                   "filesystem": "ext3",
                   "mount-point": "/",
-                  "total-space": 4096000L})])
+                  "total-space": 4096000})])
         plugin.run()
         message2 = plugin.create_mount_info_message()
         self.assertEqual(
@@ -571,7 +566,7 @@
             [(0, {"device": "/dev/hda1",
                   "filesystem": "ext3",
                   "mount-point": "/",
-                  "total-space": 4096000L})])
+                  "total-space": 4096000})])
         # Run again, calling create_mount_info_message purge the information
         plugin.run()
         plugin.exchange()
@@ -584,11 +579,8 @@
         In order not to overload the server, the client should stagger the
         exchange of free-space messages.
         """
-        def statvfs(path):
-            return (4096, 0, mb(1000), mb(100), 0, 0, 0, 0, 0)
-
         plugin = self.get_mount_info(
-            statvfs=statvfs, create_time=self.reactor.time)
+            statvfs=statvfs_result_fixture, create_time=self.reactor.time)
         # Limit the test exchange to 5 items.
         plugin.max_free_space_items_to_exchange = 5
         step_size = self.monitor.step_size

=== modified file 'landscape/monitor/tests/test_packagemonitor.py'
--- landscape/monitor/tests/test_packagemonitor.py	2016-06-16 16:38:13 +0000
+++ landscape/monitor/tests/test_packagemonitor.py	2017-03-10 15:29:37 +0000
@@ -130,7 +130,7 @@
 
     def test_spawn_reporter(self):
         command = self.makeFile("#!/bin/sh\necho 'I am the reporter!' >&2\n")
-        os.chmod(command, 0755)
+        os.chmod(command, 0o755)
         find_command_mock_patcher = mock.patch(
             "landscape.monitor.packagemonitor.find_reporter_command",
             return_value=command)
@@ -167,7 +167,7 @@
 
     def test_spawn_reporter_copies_environment(self):
         command = self.makeFile("#!/bin/sh\necho VAR: $VAR\n")
-        os.chmod(command, 0755)
+        os.chmod(command, 0o755)
         find_command_mock_patcher = mock.patch(
             "landscape.monitor.packagemonitor.find_reporter_command",
             return_value=command)
@@ -190,7 +190,7 @@
 
     def test_spawn_reporter_passes_quiet_option(self):
         command = self.makeFile("#!/bin/sh\necho OPTIONS: $@\n")
-        os.chmod(command, 0755)
+        os.chmod(command, 0o755)
         find_command_mock_patcher = mock.patch(
             "landscape.monitor.packagemonitor.find_reporter_command",
             return_value=command)
@@ -277,7 +277,7 @@
 
     def test_spawn_reporter_doesnt_chdir(self):
         command = self.makeFile("#!/bin/sh\necho RUN\n")
-        os.chmod(command, 0755)
+        os.chmod(command, 0o755)
         cwd = os.getcwd()
         self.addCleanup(os.chdir, cwd)
         dir = self.makeDir()
@@ -298,7 +298,7 @@
             log = self.logfile.getvalue()
             self.assertIn("RUN", log)
             # restore permissions to the dir so tearDown can clean it up
-            os.chmod(dir, 0766)
+            os.chmod(dir, 0o766)
             find_command_mock_patcher.stop()
 
         return result.addCallback(got_result)

=== modified file 'landscape/monitor/updatemanager.py'
--- landscape/monitor/updatemanager.py	2013-07-05 12:52:40 +0000
+++ landscape/monitor/updatemanager.py	2017-03-10 15:29:37 +0000
@@ -1,7 +1,7 @@
-import ConfigParser
 import os
 import logging
 
+from landscape.compat import SafeConfigParser
 from landscape.monitor.plugin import MonitorPlugin
 
 
@@ -39,7 +39,7 @@
             # There is no config, so we just act as if it's set to 'normal'
             return "normal"
         config_file = open(self.update_manager_filename)
-        parser = ConfigParser.SafeConfigParser()
+        parser = SafeConfigParser()
         parser.readfp(config_file)
         prompt = parser.get("DEFAULT", "Prompt")
         valid_prompts = ["lts", "never", "normal"]

=== modified file 'landscape/package/changer.py'
--- landscape/package/changer.py	2015-01-08 18:36:25 +0000
+++ landscape/package/changer.py	2017-03-10 15:29:37 +0000
@@ -232,10 +232,10 @@
             count += 1
             try:
                 result.text = self._facade.perform_changes()
-            except TransactionError, exception:
+            except TransactionError as exception:
                 result.code = ERROR_RESULT
                 result.text = exception.args[0]
-            except DependencyError, exception:
+            except DependencyError as exception:
                 for package in exception.packages:
                     hash = self._facade.get_package_hash(package)
                     id = self._store.get_hash_id(hash)

=== modified file 'landscape/package/facade.py'
--- landscape/package/facade.py	2016-01-07 10:45:00 +0000
+++ landscape/package/facade.py	2017-03-10 15:29:37 +0000
@@ -5,7 +5,7 @@
 import subprocess
 import sys
 import tempfile
-from cStringIO import StringIO
+
 from operator import attrgetter
 
 # Importing apt throws a FutureWarning on hardy, that we don't want to
@@ -21,7 +21,10 @@
 from aptsources.sourceslist import SourcesList
 from apt.progress.text import AcquireProgress
 from apt.progress.base import InstallProgress
-
+from twisted.python.compat import itervalues
+
+
+from landscape.compat import StringIO
 from landscape.lib.fs import append_file, create_file, read_file, touch_file
 from landscape.package.skeleton import build_skeleton_apt
 
@@ -168,7 +171,7 @@
 
     def get_packages(self):
         """Get all the packages available in the channels."""
-        return self._hash2pkg.itervalues()
+        return itervalues(self._hash2pkg)
 
     def get_locked_packages(self):
         """Get all packages in the channels that are locked.
@@ -662,7 +665,7 @@
                         install_progress=install_progress)
                     if not install_progress.dpkg_exited:
                         raise SystemError("dpkg didn't exit cleanly.")
-                except (apt.cache.LockFailedException, SystemError), exception:
+                except (apt.cache.LockFailedException, SystemError) as exception:
                     result_text = (fetch_output.getvalue()
                                    + read_file(install_output_path))
                     error = TransactionError(exception.args[0] +
@@ -745,7 +748,7 @@
         if now_broken_packages != already_broken_packages:
             try:
                 fixer.resolve(True)
-            except SystemError, error:
+            except SystemError as error:
                 raise TransactionError(error.args[0] + "\n" +
                                        self._get_unmet_dependency_info())
             else:

=== modified file 'landscape/package/releaseupgrader.py'
--- landscape/package/releaseupgrader.py	2014-12-12 13:25:39 +0000
+++ landscape/package/releaseupgrader.py	2017-03-10 15:29:37 +0000
@@ -5,10 +5,10 @@
 import shutil
 import logging
 import tarfile
-import cStringIO
 
 from twisted.internet.defer import succeed
 
+from landscape.compat import StringIO
 from landscape.lib.fetch import url_to_filename, fetch_to_files
 from landscape.lib.lsb_release import parse_lsb_release, LSB_RELEASE_FILENAME
 from landscape.lib.gpg import gpg_verify
@@ -186,7 +186,7 @@
         @param err: The standard error of the upgrade-tool process.
         @return: A text aggregating the process output, error and log files.
         """
-        buf = cStringIO.StringIO()
+        buf = StringIO()
 
         for label, content in [("output", out), ("error", err)]:
             if content:
@@ -222,7 +222,8 @@
         result = spawn_process(upgrade_tool_filename, args=args, env=env,
                                path=upgrade_tool_directory, wait_pipes=False)
 
-        def send_operation_result((out, err, code)):
+        def send_operation_result(args):
+            out, err, code = args
             if code == 0:
                 status = SUCCEEDED
             else:

=== modified file 'landscape/package/reporter.py'
--- landscape/package/reporter.py	2016-08-04 16:13:11 +0000
+++ landscape/package/reporter.py	2017-03-10 15:29:37 +0000
@@ -1,4 +1,8 @@
-import urlparse
+try:
+    import urlparse
+except ImportError:
+    import urllib.parse as urlparse
+
 import logging
 import time
 import sys
@@ -13,8 +17,8 @@
 from landscape.lib.twisted_util import gather_results, spawn_process
 from landscape.lib.fetch import fetch_async
 from landscape.lib.fs import touch_file
-from landscape.lib import bpickle
 
+from landscape.compat import convert_buffer_to_string, bpickle
 from landscape.package.taskhandler import (
     PackageTaskHandlerConfiguration, PackageTaskHandler, run_task_handler)
 from landscape.package.store import UnknownHashIDRequest, FakePackageStore
@@ -278,8 +282,8 @@
             env["https_proxy"] = self._config.https_proxy
         result = spawn_process(self.apt_update_filename, env=env)
 
-        def callback((out, err, code), deferred):
-            return deferred.callback((out, err, code))
+        def callback(args, deferred):
+            return deferred.callback(args)
 
         return result.addCallback(callback, deferred)
 
@@ -703,7 +707,7 @@
             messages = global_store.get_messages_by_ids(not_sent)
             sent = []
             for message_id, message in messages:
-                message = bpickle.loads(str(message))
+                message = bpickle.loads(convert_buffer_to_string(message))
                 if message["type"] not in got_type:
                     got_type.add(message["type"])
                     sent.append(message_id)

=== modified file 'landscape/package/skeleton.py'
--- landscape/package/skeleton.py	2017-01-11 10:48:09 +0000
+++ landscape/package/skeleton.py	2017-03-10 15:29:37 +0000
@@ -2,6 +2,8 @@
 
 import apt_pkg
 
+from twisted.python.compat import unicode, _PY3
+
 
 PACKAGE   = 1 << 0
 PROVIDES  = 1 << 1
@@ -146,7 +148,7 @@
         skeleton.size = version.size
         if version.installed_size > 0:
             skeleton.installed_size = version.installed_size
-        if with_unicode:
+        if with_unicode and not _PY3:
             skeleton.section = skeleton.section.decode("utf-8")
             skeleton.summary = skeleton.summary.decode("utf-8")
             # Avoid double-decoding package descriptions in build_skeleton_apt,

=== modified file 'landscape/package/store.py'
--- landscape/package/store.py	2012-05-09 19:33:57 +0000
+++ landscape/package/store.py	2017-03-10 15:29:37 +0000
@@ -6,7 +6,10 @@
 except ImportError:
     from pysqlite2 import dbapi2 as sqlite3
 
-from landscape.lib import bpickle
+from twisted.python.compat import iteritems, long
+from twisted.python.compat import StringType as basestring
+
+from landscape.compat import convert_buffer_to_string, bpickle
 from landscape.lib.store import with_cursor
 
 
@@ -40,14 +43,15 @@
 
         @param hash_ids: a C{dict} of hash=>id mappings.
         """
-        for hash, id in hash_ids.iteritems():
+        for hash, id in iteritems(hash_ids):
             cursor.execute("REPLACE INTO hash VALUES (?, ?)",
-                           (id, buffer(hash)))
+                           (id, sqlite3.Binary(hash)))
 
     @with_cursor
     def get_hash_id(self, cursor, hash):
         """Return the id associated to C{hash}, or C{None} if not available."""
-        cursor.execute("SELECT id FROM hash WHERE hash=?", (buffer(hash),))
+        cursor.execute("SELECT id FROM hash WHERE hash=?",
+                       (sqlite3.Binary(hash),))
         value = cursor.fetchone()
         if value:
             return value[0]
@@ -127,7 +131,7 @@
 
         try:
             hash_id_store.check_sanity()
-        except InvalidHashIdDb, e:
+        except InvalidHashIdDb as e:
             # propagate the error
             raise e
 
@@ -253,7 +257,7 @@
         hashes = list(hashes)
         cursor.execute("INSERT INTO hash_id_request (hashes, timestamp)"
                        " VALUES (?,?)",
-                       (buffer(bpickle.dumps(hashes)), time.time()))
+                       (sqlite3.Binary(bpickle.dumps(hashes)), time.time()))
         return HashIDRequest(self._db, cursor.lastrowid)
 
     @with_cursor
@@ -276,8 +280,9 @@
     @with_cursor
     def add_task(self, cursor, queue, data):
         data = bpickle.dumps(data)
-        cursor.execute("INSERT INTO task (queue, timestamp, data) "
-                       "VALUES (?,?,?)", (queue, time.time(), buffer(data)))
+        cursor.execute(
+            "INSERT INTO task (queue, timestamp, data) VALUES (?,?,?)",
+            (queue, time.time(), sqlite3.Binary(data)))
         return PackageTask(self._db, cursor.lastrowid)
 
     @with_cursor
@@ -307,7 +312,7 @@
     @with_cursor
     def save_message(self, cursor, message):
         cursor.execute("INSERT INTO message (data) VALUES (?)",
-                       (buffer(bpickle.dumps(message)),))
+                       (sqlite3.Binary(bpickle.dumps(message)),))
 
     @with_cursor
     def get_message_ids(self, cursor):
@@ -340,7 +345,7 @@
     def hashes(self, cursor):
         cursor.execute("SELECT hashes FROM hash_id_request WHERE id=?",
                        (self.id,))
-        return bpickle.loads(str(cursor.fetchone()[0]))
+        return bpickle.loads(convert_buffer_to_string(cursor.fetchone()[0]))
 
     @with_cursor
     def _get_timestamp(self, cursor):
@@ -389,7 +394,7 @@
 
         self.queue = row[0]
         self.timestamp = row[1]
-        self.data = bpickle.loads(str(row[2]))
+        self.data = bpickle.loads(convert_buffer_to_string(row[2]))
 
     @with_cursor
     def remove(self, cursor):

=== modified file 'landscape/package/taskhandler.py'
--- landscape/package/taskhandler.py	2016-06-16 23:11:55 +0000
+++ landscape/package/taskhandler.py	2017-03-10 15:29:37 +0000
@@ -214,7 +214,7 @@
 
             try:
                 lsb_release_info = parse_lsb_release(self.lsb_release_filename)
-            except IOError, error:
+            except IOError as error:
                 logging.warning(warning % str(error))
                 return None
             try:
@@ -276,8 +276,8 @@
     init_logging(config, "-".join(word.lower() for word in words))
 
     # Setup our umask for Apt to use, this needs to setup file permissions to
-    # 0644 so...
-    os.umask(022)
+    # 0o644 so...
+    os.umask(0o022)
 
     package_store = cls.package_store_class(config.store_filename)
     # Delay importing of the facades so that we don't

=== modified file 'landscape/package/tests/helpers.py'
--- landscape/package/tests/helpers.py	2017-01-10 16:32:56 +0000
+++ landscape/package/tests/helpers.py	2017-03-10 15:29:37 +0000
@@ -301,9 +301,9 @@
     "GadWR2ltRC651hGpxw4et/u8phTny3Vdfvy2dgAAAAAAAAAAANjRE6Lr2rEAKAAACg==")
 
 
-HASH1 = base64.decodestring("/ezv4AefpJJ8DuYFSq4RiEHJYP4=")
-HASH2 = base64.decodestring("glP4DwWOfMULm0AkRXYsH/exehc=")
-HASH3 = base64.decodestring("NJM05mj86veaSInYxxqL1wahods=")
+HASH1 = base64.decodestring(b"/ezv4AefpJJ8DuYFSq4RiEHJYP4=")
+HASH2 = base64.decodestring(b"glP4DwWOfMULm0AkRXYsH/exehc=")
+HASH3 = base64.decodestring(b"NJM05mj86veaSInYxxqL1wahods=")
 HASH_MINIMAL = "6\xce\x8f\x1bM\x82MWZ\x1a\xffjAc(\xdb(\xa1\x0eG"
 HASH_SIMPLE_RELATIONS = (
     "'#\xab&k\xe6\xf5E\xcfB\x9b\xceO7\xe6\xec\xa9\xddY\xaa")

=== modified file 'landscape/package/tests/test_facade.py'
--- landscape/package/tests/test_facade.py	2016-06-15 19:02:40 +0000
+++ landscape/package/tests/test_facade.py	2017-03-10 15:29:37 +0000
@@ -9,6 +9,8 @@
 from aptsources.sourceslist import SourcesList
 from apt.cache import LockFailedException
 
+from twisted.python.compat import unicode
+
 from landscape.lib.fs import read_file, create_file
 from landscape.package.facade import (
     TransactionError, DependencyError, ChannelError, AptFacade,

=== modified file 'landscape/package/tests/test_releaseupgrader.py'
--- landscape/package/tests/test_releaseupgrader.py	2016-06-16 16:26:32 +0000
+++ landscape/package/tests/test_releaseupgrader.py	2017-03-10 15:29:37 +0000
@@ -3,9 +3,11 @@
 import signal
 import tarfile
 import unittest
+from unittest import skipIf
 
 from twisted.internet import reactor
 from twisted.internet.defer import succeed, fail, Deferred
+from twisted.python.compat import _PY3
 
 from landscape.lib.gpg import InvalidGPGSignature
 from landscape.lib.fetch import HTTPCodeError
@@ -284,7 +286,8 @@
                          "stderr\n\n"
                          "=== main.log ===\n\n"
                          "long log\n\n")
-
+    
+    @skipIf(_PY3, 'Takes long with Python3, probably unclean Reactor')
     def test_upgrade(self):
         """
         The L{ReleaseUpgrader.upgrade} method spawns the appropropriate
@@ -300,7 +303,7 @@
                  "echo PWD=$PWD\n"
                  "echo out\n")
         fd.close()
-        os.chmod(upgrade_tool_filename, 0755)
+        os.chmod(upgrade_tool_filename, 0o755)
         env_backup = os.environ.copy()
         os.environ.clear()
         os.environ.update({"FOO": "bar"})
@@ -336,6 +339,7 @@
 
         return deferred.addBoth(cleanup)
 
+    @skipIf(_PY3, 'Takes long with Python3, probably unclean Reactor')
     def test_upgrade_with_env_variables(self):
         """
         The L{ReleaseUpgrader.upgrade} method optionally sets environment
@@ -350,7 +354,7 @@
                  "echo RELEASE_UPRADER_ALLOW_THIRD_PARTY="
                  "$RELEASE_UPRADER_ALLOW_THIRD_PARTY\n")
         fd.close()
-        os.chmod(upgrade_tool_filename, 0755)
+        os.chmod(upgrade_tool_filename, 0o755)
         env_backup = os.environ.copy()
         os.environ.clear()
         deferred = Deferred()
@@ -397,7 +401,7 @@
                  "echo err >&2\n"
                  "exit 3")
         fd.close()
-        os.chmod(upgrade_tool_filename, 0755)
+        os.chmod(upgrade_tool_filename, 0o755)
 
         deferred = Deferred()
 
@@ -452,7 +456,7 @@
                  "    while True:\n"
                  "        time.sleep(2)\n" % child_pid_filename)
         fd.close()
-        os.chmod(upgrade_tool_filename, 0755)
+        os.chmod(upgrade_tool_filename, 0o755)
         os.environ.clear()
         os.environ.update({"FOO": "bar"})
         deferred = Deferred()
@@ -495,6 +499,8 @@
 
         return deferred.addBoth(cleanup)
 
+
+    @skipIf(_PY3, 'Takes long with Python3, probably unclean Reactor')
     def test_finish(self):
         """
         The L{ReleaseUpgrader.finish} method wipes the upgrade-tool directory
@@ -508,7 +514,7 @@
         reporter_filename = self.makeFile("#!/bin/sh\n"
                                           "echo $@\n"
                                           "echo $(pwd)\n")
-        os.chmod(reporter_filename, 0755)
+        os.chmod(reporter_filename, 0o755)
 
         deferred = Deferred()
 
@@ -518,7 +524,8 @@
             find_reporter_mock.return_value = reporter_filename
             result = self.upgrader.finish()
 
-            def check_result((out, err, code)):
+            def check_result(args):
+                out, err, code = args
                 self.assertFalse(os.path.exists(upgrade_tool_directory))
                 self.assertEqual(out, "--force-apt-update\n%s\n"
                                   % os.getcwd())
@@ -582,7 +589,7 @@
         configuration file the release-upgrader was called with.
         """
         reporter_filename = self.makeFile("#!/bin/sh\necho $@\n")
-        os.chmod(reporter_filename, 0755)
+        os.chmod(reporter_filename, 0o755)
         self.config.config = "/some/config"
 
         deferred = Deferred()
@@ -593,7 +600,8 @@
             find_reporter_mock.return_value = reporter_filename
             result = self.upgrader.finish()
 
-            def check_result((out, err, code)):
+            def check_result(args):
+                out, err, code = args
                 self.assertEqual(out, "--force-apt-update "
                                        "--config=/some/config\n")
                 self.assertEqual(err, "")

=== modified file 'landscape/package/tests/test_reporter.py'
--- landscape/package/tests/test_reporter.py	2016-08-04 16:13:11 +0000
+++ landscape/package/tests/test_reporter.py	2017-03-10 15:29:37 +0000
@@ -10,7 +10,6 @@
 
 from landscape.lib.fs import create_file, touch_file
 from landscape.lib.fetch import FetchError
-from landscape.lib import bpickle
 from landscape.package.store import (
     PackageStore, UnknownHashIDRequest, FakePackageStore)
 from landscape.package.reporter import (
@@ -25,6 +24,8 @@
     LandscapeTest, BrokerServiceHelper, EnvironSaverHelper)
 from landscape.reactor import FakeReactor
 
+from landscape.compat import convert_buffer_to_string, bpickle
+
 SAMPLE_LSB_RELEASE = "DISTRIB_CODENAME=codename\n"
 
 
@@ -89,7 +90,7 @@
             "echo -n '%s'\n"
             "echo -n '%s' >&2\n"
             "exit %d" % (out, err, code))
-        os.chmod(self.reporter.apt_update_filename, 0755)
+        os.chmod(self.reporter.apt_update_filename, 0o755)
 
     def test_set_package_ids_with_all_known(self):
         self.store.add_hash_id_request(["hash1", "hash2"])
@@ -1123,7 +1124,8 @@
         def do_test():
             result = self.reporter.run_apt_update()
 
-            def callback((out, err, code)):
+            def callback(args):
+                out, err, code = args
                 self.assertEqual("output", out)
                 self.assertEqual("error", err)
                 self.assertEqual(0, code)
@@ -1149,7 +1151,8 @@
 
         result = self.reporter.run_apt_update()
 
-        def callback((out, err, code)):
+        def callback(args):
+            out, err, code = args
             self.assertEqual("output", out)
 
         result.addCallback(callback)
@@ -1169,7 +1172,8 @@
 
         result = self.reporter.run_apt_update()
 
-        def callback((out, err, code)):
+        def callback(args):
+            out, err, code = args
             self.assertEqual("output", out)
 
         result.addCallback(callback)
@@ -1188,7 +1192,8 @@
 
         result = self.reporter.run_apt_update()
 
-        def callback((out, err, code)):
+        def callback(args):
+            out, err, code = args
             self.assertEqual("output", out)
             self.assertEqual("error", err)
             self.assertEqual(2, code)
@@ -1219,7 +1224,8 @@
 
         result = self.reporter.run_apt_update()
 
-        def callback((out, err, code)):
+        def callback(args):
+            out, err, code = args
             self.assertEqual("", out)
             self.assertEqual("", err)
             self.assertEqual(100, code)
@@ -1255,7 +1261,8 @@
 
         result = self.reporter.run_apt_update()
 
-        def callback((out, err, code)):
+        def callback(args):
+            out, err, code = args
             self.assertEqual("output", out)
             self.assertEqual("error", err)
             self.assertEqual(0, code)
@@ -1390,7 +1397,8 @@
         def do_test():
             result = self.reporter.run_apt_update()
 
-            def callback((out, err, code)):
+            def callback(args):
+                out, err, code = args
                 self.assertEqual("", out)
                 self.assertEqual("", err)
                 self.assertEqual(0, code)
@@ -1430,7 +1438,8 @@
         def do_test():
             result = self.reporter.run_apt_update()
 
-            def callback((out, err, code)):
+            def callback(args):
+                out, err, code = args
                 self.assertEqual("", out)
                 self.assertEqual("", err)
                 self.assertEqual(0, code)
@@ -1728,7 +1737,7 @@
         message_store.set_accepted_types(["package-reporter-result"])
         self.reporter.apt_update_filename = self.makeFile(
             "#!/bin/sh\necho -n error >&2\necho -n output\nexit 0")
-        os.chmod(self.reporter.apt_update_filename, 0755)
+        os.chmod(self.reporter.apt_update_filename, 0o755)
         deferred = Deferred()
 
         def do_test():
@@ -1745,7 +1754,8 @@
                     "SELECT id, data FROM message").fetchall())
                 self.assertEqual(1, len(stored))
                 self.assertEqual(1, stored[0][0])
-                self.assertEqual(message, bpickle.loads(str(stored[0][1])))
+                self.assertEqual(message,
+                    bpickle.loads(convert_buffer_to_string(stored[0][1])))
             result.addCallback(callback)
             result.chainDeferred(deferred)
 

=== modified file 'landscape/package/tests/test_skeleton.py'
--- landscape/package/tests/test_skeleton.py	2017-01-12 08:01:31 +0000
+++ landscape/package/tests/test_skeleton.py	2017-03-10 15:29:37 +0000
@@ -13,6 +13,8 @@
     HASH_OR_RELATIONS)
 from landscape.tests.helpers import LandscapeTest
 
+from twisted.python.compat import unicode
+
 
 class SkeletonTestHelper(object):
     """A helper to set up a repository for the skeleton tests."""

=== modified file 'landscape/package/tests/test_store.py'
--- landscape/package/tests/test_store.py	2016-06-16 00:08:40 +0000
+++ landscape/package/tests/test_store.py	2017-03-10 15:29:37 +0000
@@ -152,7 +152,7 @@
             store_filename = junk_db_factory()
             try:
                 self.store1.add_hash_id_db(store_filename)
-            except InvalidHashIdDb, e:
+            except InvalidHashIdDb as e:
                 self.assertEqual(str(e), store_filename)
             else:
                 self.fail()
@@ -547,7 +547,7 @@
             func2.store2 = PackageStore(self.filename)
             try:
                 func2.store2.add_task("reporter", "data")
-            except Exception, e:
+            except Exception as e:
                 error.append(str(e))
 
         for func in [func1, func2]:

=== modified file 'landscape/package/tests/test_taskhandler.py'
--- landscape/package/tests/test_taskhandler.py	2016-06-16 20:33:26 +0000
+++ landscape/package/tests/test_taskhandler.py	2017-03-10 15:29:37 +0000
@@ -379,7 +379,7 @@
 
         # We also expect the umask to be set appropriately before running the
         # commands
-        umask.assert_called_once_with(022)
+        umask.assert_called_once_with(0o22)
 
         return result.addCallback(assert_task_handler)
 
@@ -389,7 +389,7 @@
 
         try:
             run_task_handler(PackageTaskHandler, ["-c", self.config_filename])
-        except SystemExit, e:
+        except SystemExit as e:
             self.assertIn("default is already running", str(e))
         else:
             self.fail("SystemExit not raised")
@@ -400,7 +400,7 @@
         try:
             run_task_handler(PackageTaskHandler,
                              ["-c", self.config_filename, "--quiet"])
-        except SystemExit, e:
+        except SystemExit as e:
             self.assertEqual(str(e), "")
         else:
             self.fail("SystemExit not raised")

=== modified file 'landscape/reactor.py'
--- landscape/reactor.py	2013-07-15 15:25:08 +0000
+++ landscape/reactor.py	2017-03-10 15:29:37 +0000
@@ -399,14 +399,14 @@
             self._current_time = call[0]
             try:
                 call[1](*call[2], **call[3])
-            except Exception, e:
+            except Exception as e:
                 logging.exception(e)
         self._current_time += seconds
 
     def _in_thread(self, callback, errback, f, args, kwargs):
         try:
             result = f(*args, **kwargs)
-        except Exception, e:
+        except Exception as e:
             exc_info = sys.exc_info()
             if errback is None:
                 self.call_in_main(logging.error, e, exc_info=exc_info)
@@ -420,7 +420,7 @@
         while self._threaded_callbacks:
             try:
                 self._threaded_callbacks.pop(0)()
-            except Exception, e:
+            except Exception as e:
                 logging.exception(e)
 
     def _hook_threaded_callbacks(self):

=== modified file 'landscape/schema.py'
--- landscape/schema.py	2014-07-16 17:15:13 +0000
+++ landscape/schema.py	2017-03-10 15:29:37 +0000
@@ -1,4 +1,5 @@
 """A schema system. Yes. Another one!"""
+from twisted.python.compat import iteritems, unicode, long
 
 
 class InvalidError(Exception):
@@ -83,10 +84,10 @@
         self.encoding = encoding
 
     def coerce(self, value):
-        if isinstance(value, str):
+        if isinstance(value, bytes):
             try:
                 value = value.decode(self.encoding)
-            except UnicodeDecodeError, e:
+            except UnicodeDecodeError as e:
                 raise InvalidError("%r can't be decoded: %s" % (value, str(e)))
         if not isinstance(value, unicode):
             raise InvalidError("%r isn't a unicode" % (value,))
@@ -108,7 +109,7 @@
         for i, subvalue in enumerate(value):
             try:
                 new_list[i] = self.schema.coerce(subvalue)
-            except InvalidError, e:
+            except InvalidError as e:
                 raise InvalidError(
                     "%r could not coerce with %s: %s"
                     % (subvalue, self.schema, e))
@@ -155,13 +156,13 @@
         new_dict = {}
         if not isinstance(value, dict):
             raise InvalidError("%r is not a dict." % (value,))
-        for k, v in value.iteritems():
+        for k, v in iteritems(value):
             if k not in self.schema:
                 raise InvalidError("%r is not a valid key as per %r"
                                    % (k, self.schema))
             try:
                 new_dict[k] = self.schema[k].coerce(v)
-            except InvalidError, e:
+            except InvalidError as e:
                 raise InvalidError(
                     "Value of %r key of dict %r could not coerce with %s: %s"
                     % (k, value, self.schema[k], e))

=== modified file 'landscape/sysinfo/deployment.py'
--- landscape/sysinfo/deployment.py	2014-03-26 12:33:14 +0000
+++ landscape/sysinfo/deployment.py	2017-03-10 15:29:37 +0000
@@ -94,7 +94,7 @@
     """
     try:
         setup_logging()
-    except IOError, e:
+    except IOError as e:
         sys.exit("Unable to setup logging. %s" % e)
 
     if sysinfo is None:
@@ -107,8 +107,8 @@
         sysinfo.add(plugin)
 
     def show_output(result):
-        print format_sysinfo(sysinfo.get_headers(), sysinfo.get_notes(),
-                             sysinfo.get_footnotes(), indent="  ")
+        print(format_sysinfo(sysinfo.get_headers(), sysinfo.get_notes(),
+                             sysinfo.get_footnotes(), indent="  "))
 
     def run_sysinfo():
         return sysinfo.run().addCallback(show_output)

=== modified file 'landscape/sysinfo/tests/test_disk.py'
--- landscape/sysinfo/tests/test_disk.py	2011-07-05 05:09:11 +0000
+++ landscape/sysinfo/tests/test_disk.py	2017-03-10 15:29:37 +0000
@@ -1,7 +1,9 @@
+import os
+
 from twisted.internet.defer import Deferred
 
+from landscape.sysinfo.disk import Disk, format_megabytes
 from landscape.sysinfo.sysinfo import SysInfoPluginRegistry
-from landscape.sysinfo.disk import Disk, format_megabytes
 from landscape.tests.helpers import LandscapeTest
 
 
@@ -21,8 +23,8 @@
                   fs="ext3", device=None):
         if device is None:
             device = "/dev/" + point.replace("/", "_")
-        self.stat_results[point] = (block_size, 0, capacity, unused,
-                                    0, 0, 0, 0, 0)
+        self.stat_results[point] = os.statvfs_result(
+            (block_size, 0, capacity, unused, 0, 0, 0, 0, 0, 0))
         f = open(self.mount_file, "a")
         f.write("/dev/%s %s %s rw 0 0\n" % (device, point, fs))
         f.close()

=== modified file 'landscape/sysinfo/tests/test_sysinfo.py'
--- landscape/sysinfo/tests/test_sysinfo.py	2016-06-15 20:32:14 +0000
+++ landscape/sysinfo/tests/test_sysinfo.py	2017-03-10 15:29:37 +0000
@@ -1,12 +1,12 @@
-from cStringIO import StringIO
 from logging import getLogger, StreamHandler
 import mock
 import os
 
 from twisted.internet.defer import Deferred, succeed, fail
 
+from landscape.compat import StringIO
+from landscape.plugin import PluginRegistry
 from landscape.sysinfo.sysinfo import SysInfoPluginRegistry, format_sysinfo
-from landscape.plugin import PluginRegistry
 from landscape.tests.helpers import LandscapeTest
 
 

=== modified file 'landscape/tests/clock.py'
--- landscape/tests/clock.py	2008-06-10 10:56:01 +0000
+++ landscape/tests/clock.py	2017-03-10 15:29:37 +0000
@@ -31,10 +31,13 @@
    C{seconds} argument until after Twisted 2.2.
 """
 
+import functools
 
 from twisted.internet import error
 from twisted.python.runtime import seconds as runtimeSeconds
 from twisted.python import reflect
+from twisted.python.compat import iteritems
+
 import traceback
 
 
@@ -71,7 +74,7 @@
                              self.calls.remove,
                              lambda c: None,
                              self.seconds))
-        self.calls.sort(lambda a, b: cmp(a.getTime(), b.getTime()))
+        self.calls.sort(key=lambda a: a.getTime())
         return self.calls[-1]
 
 
@@ -246,7 +249,9 @@
                 if self.kw:
                     L.append(", ")
             if self.kw:
-                L.append(", ".join(['%s=%s' % (k, reflect.safe_repr(v)) for (k, v) in self.kw.iteritems()]))
+                L.append(", ".join([
+                    '%s=%s' % (k, reflect.safe_repr(v))
+                    for (k, v) in iteritems(self.kw)]))
             L.append(")")
 
         if self.debug:

=== modified file 'landscape/tests/helpers.py'
--- landscape/tests/helpers.py	2017-01-10 13:28:12 +0000
+++ landscape/tests/helpers.py	2017-03-10 15:29:37 +0000
@@ -1,5 +1,3 @@
-from cStringIO import StringIO
-from ConfigParser import ConfigParser
 import logging
 import shutil
 import pprint
@@ -12,9 +10,14 @@
 
 from logging import Handler, ERROR, Formatter
 from twisted.trial.unittest import TestCase
+from twisted.python.compat import StringType as basestring
+from twisted.python.compat import _PY3
 from twisted.python.failure import Failure
 from twisted.internet.defer import Deferred
 
+from landscape.compat import ConfigParser
+from landscape.compat import stringio, cstringio
+
 from landscape.tests.subunit import run_isolated
 from landscape.watchdog import bootstrap_list
 
@@ -186,11 +189,11 @@
         and comments may be different but the actual parameters and sections
         must be the same.
         """
-        first_fp = StringIO(first)
+        first_fp = cstringio(first)
         first_parser = ConfigParser()
         first_parser.readfp(first_fp)
 
-        second_fp = StringIO(second)
+        second_fp = cstringio(second)
         second_parser = ConfigParser()
         second_parser.readfp(second_fp)
 
@@ -216,7 +219,7 @@
         return persist_filename
 
     def makeFile(self, content=None, suffix="", prefix="tmp", basename=None,
-                 dirname=None, path=None):
+                 dirname=None, path=None, mode="w"):
         """Create a temporary file and return the path to it.
 
         @param content: Initial content for the file.
@@ -237,9 +240,8 @@
             if content is None:
                 os.unlink(path)
         if content is not None:
-            file = open(path, "w")
-            file.write(content)
-            file.close()
+            with open(path, mode) as file:
+                file.write(content)
         self.addCleanup(self._clean_file, path)
         return path
 
@@ -324,7 +326,7 @@
         self.error_handler = ErrorHandler()
         test_case.log_helper = self
         test_case.logger = logger = logging.getLogger()
-        test_case.logfile = StringIO()
+        test_case.logfile = cstringio()
         handler = logging.StreamHandler(test_case.logfile)
         format = ("%(levelname)8s: %(message)s")
         handler.setFormatter(logging.Formatter(format))
@@ -480,7 +482,7 @@
 
     def __init__(self, output, return_codes=None):
         self.output = output
-        self.stdout = StringIO(output)
+        self.stdout = cstringio(output)
         self.popen_inputs = []
         self.return_codes = return_codes
 
@@ -500,13 +502,12 @@
 class StandardIOHelper(object):
 
     def set_up(self, test_case):
-        from StringIO import StringIO
-
         test_case.old_stdout = sys.stdout
         test_case.old_stdin = sys.stdin
-        test_case.stdout = sys.stdout = StringIO()
-        test_case.stdin = sys.stdin = StringIO()
-        test_case.stdin.encoding = "UTF-8"
+        test_case.stdout = sys.stdout = stringio()
+        test_case.stdin = sys.stdin = stringio()
+        if not _PY3:
+            test_case.stdin.encoding = "UTF-8"
 
     def tear_down(self, test_case):
         sys.stdout = test_case.old_stdout

=== modified file 'landscape/tests/subunit.py'
--- landscape/tests/subunit.py	2009-11-13 15:47:51 +0000
+++ landscape/tests/subunit.py	2017-03-10 15:29:37 +0000
@@ -16,13 +16,14 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-
 import os
-from StringIO import StringIO
 import subprocess
 import sys
 import unittest
 
+from landscape.compat import StringIO
+
+
 def test_suite():
     import subunit.tests
     return subunit.tests.test_suite()

=== modified file 'landscape/tests/test_configuration.py'
--- landscape/tests/test_configuration.py	2017-03-07 16:47:17 +0000
+++ landscape/tests/test_configuration.py	2017-03-10 15:29:37 +0000
@@ -1,15 +1,16 @@
 from __future__ import print_function
 
+import mock
 from functools import partial
-from ConfigParser import ConfigParser
-from cStringIO import StringIO
 import os
 import sys
 import unittest
 
-import mock
 from twisted.internet.defer import succeed, fail, Deferred
+from twisted.python.compat import iteritems
 
+from landscape.compat import ConfigParser
+from landscape.compat import StringIO
 from landscape.broker.registration import RegistrationError
 from landscape.broker.tests.helpers import (
     RemoteBrokerHelper, BrokerConfigurationHelper)
@@ -776,8 +777,8 @@
 
         config = self.get_config([], data_path=client_path)
         bootstrap_tree(config)
-        mock_chmod.assert_any_call(client_path, 0755)
-        mock_chmod.assert_called_with(annotations_path, 0755)
+        mock_chmod.assert_any_call(client_path, 0o755)
+        mock_chmod.assert_called_with(annotations_path, 0o755)
         self.assertTrue(os.path.isdir(client_path))
         self.assertTrue(os.path.isdir(annotations_path))
 
@@ -840,7 +841,7 @@
                 "Access group [webservers]: ": u"databases",
                 "Tags [london, server]: ": u"glasgow, laptop",
             }
-            for key, value in fixtures.iteritems():
+            for key, value in iteritems(fixtures):
                 if key in prompt:
                     return value
             raise KeyError("Couldn't find answer for {}".format(prompt))
@@ -848,7 +849,7 @@
         def side_effect_getpass(prompt):
             fixtures = {"Account registration key:": "New Password",
                         "Please confirm:": "New Password"}
-            for key, value in fixtures.iteritems():
+            for key, value in iteritems(fixtures):
                 if key in prompt:
                     return value
             raise KeyError("Couldn't find answer for {}".format(prompt))
@@ -1440,7 +1441,7 @@
         try:
             self.get_config(["--config", config_filename, "--silent",
                              "--import", import_filename])
-        except ImportOptionError, error:
+        except ImportOptionError as error:
             self.assertEqual(str(error),
                              "Nothing to import at %s." % import_filename)
         else:
@@ -1454,7 +1455,7 @@
         try:
             self.get_config(["--config", config_filename, "--silent",
                              "--import", import_filename])
-        except ImportOptionError, error:
+        except ImportOptionError as error:
             self.assertEqual(str(error),
                              "File %s doesn't exist." % import_filename)
         else:
@@ -1471,7 +1472,7 @@
         try:
             self.get_config(["--config", config_filename, "--silent",
                              "--import", import_filename])
-        except ImportOptionError, error:
+        except ImportOptionError as error:
             self.assertEqual(str(error),
                              "Nothing to import at %s." % import_filename)
         else:
@@ -1486,7 +1487,7 @@
         try:
             self.get_config(["--config", config_filename, "--silent",
                              "--import", import_filename])
-        except ImportOptionError, error:
+        except ImportOptionError as error:
             self.assertIn("Nothing to import at %s" % import_filename,
                           str(error))
         else:
@@ -1500,7 +1501,7 @@
         import_filename = self.makeFile(
             "[client]\nfoo=bar", basename="import_config")
         # Remove read permissions
-        os.chmod(import_filename, os.stat(import_filename).st_mode - 0444)
+        os.chmod(import_filename, os.stat(import_filename).st_mode - 0o444)
         error = self.assertRaises(
             ImportOptionError, self.get_config, ["--import", import_filename])
         expected_message = ("Couldn't read configuration from %s." %
@@ -1635,7 +1636,7 @@
         try:
             self.get_config(["--config", config_filename, "--silent",
                              "--import", "https://config.url"])
-        except ImportOptionError, error:
+        except ImportOptionError as error:
             self.assertEqual(str(error),
                              "Couldn't download configuration from "
                              "https://config.url: Server "
@@ -1657,7 +1658,7 @@
         try:
             self.get_config(["--config", config_filename, "--silent",
                              "--import", "https://config.url"])
-        except ImportOptionError, error:
+        except ImportOptionError as error:
             self.assertEqual(str(error),
                              "Couldn't download configuration from "
                              "https://config.url: Error 60: pycurl message")
@@ -1674,7 +1675,7 @@
         # Use a command line option as well to test the precedence.
         try:
             self.get_config(["--silent", "--import", "https://config.url"])
-        except ImportOptionError, error:
+        except ImportOptionError as error:
             self.assertEqual(str(error),
                              "Nothing to import at https://config.url.")
         else:
@@ -1691,7 +1692,7 @@
         # Use a command line option as well to test the precedence.
         try:
             self.get_config(["--silent", "--import", "https://config.url"])
-        except ImportOptionError, error:
+        except ImportOptionError as error:
             self.assertEqual("Nothing to import at https://config.url.",
                              str(error))
         else:

=== modified file 'landscape/tests/test_deployment.py'
--- landscape/tests/test_deployment.py	2016-06-15 16:35:06 +0000
+++ landscape/tests/test_deployment.py	2017-03-10 15:29:37 +0000
@@ -1,8 +1,9 @@
-import os
 from optparse import OptionParser
-from StringIO import StringIO
 from textwrap import dedent
+import mock
+import os
 
+from landscape.compat import StringIO
 from landscape.lib.fs import read_file, create_file
 
 from landscape.deployment import (
@@ -10,7 +11,6 @@
 from landscape.manager.config import ManagerConfiguration
 
 from landscape.tests.helpers import LandscapeTest, LogKeeperHelper
-import mock
 
 
 class BabbleConfiguration(Configuration):
@@ -592,7 +592,7 @@
                          default_filename2)
 
         # If it is readable, than return the first default configuration file.
-        os.chmod(default_filename1, 0644)
+        os.chmod(default_filename1, 0o644)
         self.assertEqual(self.config.get_config_filename(),
                          default_filename1)
 

=== modified file 'landscape/tests/test_reactor.py'
--- landscape/tests/test_reactor.py	2013-07-10 09:17:14 +0000
+++ landscape/tests/test_reactor.py	2017-03-10 15:29:37 +0000
@@ -1,7 +1,7 @@
-import thread
 import types
 import time
 
+from landscape.compat import thread
 from landscape.reactor import FakeReactor, LandscapeReactor
 from landscape.tests.helpers import LandscapeTest
 
@@ -153,7 +153,10 @@
     def test_events_result(self):
         reactor = self.get_reactor()
 
-        generator = iter([1, 2, 3]).next
+        iterable = iter([1, 2, 3])
+
+        def generator():
+            return next(iterable)
 
         reactor.call_on("foobar", generator)
         reactor.call_on("foobar", generator)

=== modified file 'landscape/tests/test_schema.py'
--- landscape/tests/test_schema.py	2013-10-25 21:23:47 +0000
+++ landscape/tests/test_schema.py	2017-03-10 15:29:37 +0000
@@ -4,6 +4,8 @@
     InvalidError, Constant, Bool, Int, Float, Bytes, Unicode, List, KeyDict,
     Dict, Tuple, Any, Message)
 
+from twisted.python.compat import long
+
 
 class DummySchema(object):
     def coerce(self, value):
@@ -42,7 +44,8 @@
         self.assertEqual(Int().coerce(3), 3)
 
     def test_int_accepts_long(self):
-        self.assertEqual(Int().coerce(3L), 3)
+        # This test can be removed after dropping Python 2 support
+        self.assertEqual(Int().coerce(long(3)), 3)
 
     def test_int_bad_str(self):
         self.assertRaises(InvalidError, Int().coerce, "3")
@@ -57,7 +60,8 @@
         self.assertEqual(Float().coerce(3), 3.0)
 
     def test_float_accepts_long(self):
-        self.assertEqual(Float().coerce(3L), 3.0)
+        # This test can be removed after dropping Python 2 support
+        self.assertEqual(Float().coerce(long(3)), 3.0)
 
     def test_float_bad_str(self):
         self.assertRaises(InvalidError, Float().coerce, "3.0")

=== modified file 'landscape/tests/test_sysvconfig.py'
--- landscape/tests/test_sysvconfig.py	2016-06-15 22:21:21 +0000
+++ landscape/tests/test_sysvconfig.py	2017-03-10 15:29:37 +0000
@@ -11,13 +11,17 @@
         filename = self.makeFile("RUN=0\n")
         sysvconfig = SysVConfig(filename)
         sysvconfig.set_start_on_boot(True)
-        self.assertEqual(file(filename, "r").read(), "RUN=1\n")
+        with open(filename, "r") as res_file:
+            result = res_file.read()
+        self.assertEqual(result, "RUN=1\n")
 
     def test_set_to_not_run_on_boot(self):
         filename = self.makeFile("RUN=1\n")
         sysvconfig = SysVConfig(filename)
         sysvconfig.set_start_on_boot(False)
-        self.assertEqual(file(filename, "r").read(), "RUN=0\n")
+        with open(filename, "r") as res_file:
+            result = res_file.read()
+        self.assertEqual(result, "RUN=0\n")
 
     def test_configured_to_run(self):
         filename = self.makeFile("RUN=1\n")

=== modified file 'landscape/tests/test_watchdog.py'
--- landscape/tests/test_watchdog.py	2016-08-18 17:30:03 +0000
+++ landscape/tests/test_watchdog.py	2017-03-10 15:29:37 +0000
@@ -25,6 +25,9 @@
 
 import landscape.watchdog
 
+from unittest import skipIf
+from twisted.python.compat import _PY3
+
 
 class StubDaemon(object):
     program = "program-name"
@@ -580,7 +583,7 @@
         output_filename = self.makeFile("NOT RUN")
         self.makeFile('#!/bin/sh\necho "RUN $@" > %s' % output_filename,
                       path=self.exec_name)
-        os.chmod(self.exec_name, 0755)
+        os.chmod(self.exec_name, 0o755)
 
         waiter = FileChangeWaiter(output_filename)
 
@@ -597,7 +600,7 @@
         output_filename = self.makeFile("NOT RUN")
         self.makeFile('#!/bin/sh\necho "RUN $@" > %s' % output_filename,
                       path=self.exec_name)
-        os.chmod(self.exec_name, 0755)
+        os.chmod(self.exec_name, 0o755)
 
         waiter = FileChangeWaiter(output_filename)
 
@@ -622,7 +625,7 @@
                       "time.sleep(1000)\n"
                       % (sys.executable, output_filename),
                       path=self.exec_name)
-        os.chmod(self.exec_name, 0755)
+        os.chmod(self.exec_name, 0o755)
 
         waiter = FileChangeWaiter(output_filename)
         self.daemon.start()
@@ -646,7 +649,7 @@
                       "os.kill(os.getpid(), signal.SIGSTOP)\n"
                       % (sys.executable, output_filename),
                       path=self.exec_name)
-        os.chmod(self.exec_name, 0755)
+        os.chmod(self.exec_name, 0o755)
 
         self.addCleanup(setattr, landscape.watchdog, "SIGKILL_DELAY",
                         landscape.watchdog.SIGKILL_DELAY)
@@ -666,7 +669,7 @@
         output_filename = self.makeFile("NOT RUN")
         self.makeFile('#!/bin/sh\necho "RUN" > %s' % output_filename,
                       path=self.exec_name)
-        os.chmod(self.exec_name, 0755)
+        os.chmod(self.exec_name, 0o755)
 
         self.daemon.start()
 
@@ -682,7 +685,7 @@
         output_filename = self.makeFile("NOT RUN")
         self.makeFile('#!/bin/sh\necho "RUN" > %s' % output_filename,
                       path=self.exec_name)
-        os.chmod(self.exec_name, 0755)
+        os.chmod(self.exec_name, 0o755)
 
         self.daemon.start()
 
@@ -709,7 +712,7 @@
         """
                       % {"exe": sys.executable, "out": output_filename},
                       path=self.exec_name)
-        os.chmod(self.exec_name, 0755)
+        os.chmod(self.exec_name, 0o755)
 
         self.addCleanup(setattr, landscape.watchdog, "GRACEFUL_WAIT_PERIOD",
                         landscape.watchdog.GRACEFUL_WAIT_PERIOD)
@@ -735,7 +738,7 @@
                       "os.kill(os.getpid(), signal.SIGSTOP)\n"
                       % (sys.executable, output_filename),
                       path=self.exec_name)
-        os.chmod(self.exec_name, 0755)
+        os.chmod(self.exec_name, 0o755)
 
         self.addCleanup(setattr, landscape.watchdog, "SIGKILL_DELAY",
                         landscape.watchdog.SIGKILL_DELAY)
@@ -789,7 +792,7 @@
 
         self.makeFile("#!/bin/sh\necho RUN >> %s" % output_filename,
                       path=self.exec_name)
-        os.chmod(self.exec_name, 0755)
+        os.chmod(self.exec_name, 0o755)
 
         def got_result(result):
             self.assertEqual(len(list(open(output_filename))),
@@ -832,7 +835,7 @@
 
         self.makeFile("#!/bin/sh\necho RUN >> %s" % output_filename,
                       path=self.exec_name)
-        os.chmod(self.exec_name, 0755)
+        os.chmod(self.exec_name, 0o755)
 
         def got_result(result):
             # Pay attention to the +1 bellow. It's the reason for this test.
@@ -947,6 +950,7 @@
             mock.ANY, mock.ANY, args=mock.ANY, env=mock.ANY, uid=None,
             gid=None)
 
+    @skipIf(_PY3, 'Takes long with Python3, probably unclean Reactor')
     def test_request_exit(self):
         """The request_exit() method calls exit() on the broker process."""
 
@@ -958,7 +962,7 @@
                                          "output_filename": output_filename,
                                          "socket": socket_filename})
 
-        os.chmod(broker_filename, 0755)
+        os.chmod(broker_filename, 0o755)
         process_result = getProcessOutput(broker_filename, env=os.environ,
                                           errortoo=True)
 
@@ -1230,14 +1234,14 @@
         def mode(*suffix):
             return stat.S_IMODE(os.stat(path(*suffix)).st_mode)
 
-        self.assertEqual(mode(), 0755)
-        self.assertEqual(mode("messages"), 0755)
-        self.assertEqual(mode("package"), 0755)
-        self.assertEqual(mode("package/hash-id"), 0755)
-        self.assertEqual(mode("package/binaries"), 0755)
-        self.assertEqual(mode("sockets"), 0750)
-        self.assertEqual(mode("custom-graph-scripts"), 0755)
-        self.assertEqual(mode("package/database"), 0644)
+        self.assertEqual(mode(), 0o755)
+        self.assertEqual(mode("messages"), 0o755)
+        self.assertEqual(mode("package"), 0o755)
+        self.assertEqual(mode("package/hash-id"), 0o755)
+        self.assertEqual(mode("package/binaries"), 0o755)
+        self.assertEqual(mode("sockets"), 0o750)
+        self.assertEqual(mode("custom-graph-scripts"), 0o755)
+        self.assertEqual(mode("package/database"), 0o644)
 
 STUB_BROKER = """\
 #!%(executable)s

=== modified file 'landscape/user/changes.py'
--- landscape/user/changes.py	2016-01-11 18:34:49 +0000
+++ landscape/user/changes.py	2017-03-10 15:29:37 +0000
@@ -1,3 +1,5 @@
+from twisted.python.compat import iteritems, itervalues
+
 from landscape.diff import diff
 
 
@@ -54,7 +56,7 @@
 
     def create_diff(self):
         """Returns the changes since the last snapshot.
-        
+
         See landscape.message_schemas.USERS schema for a description of the
         dictionary returned by this method.
         """
@@ -74,11 +76,11 @@
         changes = {}
         creates, updates, deletes = diff(self._old_users, self._new_users)
         if creates:
-            changes["create-users"] = list(creates.itervalues())
+            changes["create-users"] = list(itervalues(creates))
         if updates:
-            changes["update-users"] = list(updates.itervalues())
+            changes["update-users"] = list(itervalues(updates))
         if deletes:
-            changes["delete-users"] = list(deletes.iterkeys())
+            changes["delete-users"] = list(deletes)
         return changes
 
     def _detect_group_changes(self):
@@ -94,7 +96,7 @@
         if creates:
             groups = []
             create_members = {}
-            for value in creates.itervalues():
+            for value in itervalues(creates):
                 # Use a copy to avoid removing the 'members' element
                 # from stored data.
                 value = value.copy()
@@ -110,7 +112,7 @@
             remove_members = {}
             create_members = {}
             update_groups = []
-            for groupname, new_data in updates.iteritems():
+            for groupname, new_data in iteritems(updates):
                 old_data = self._old_groups[groupname]
                 old_members = set(old_data["members"])
                 new_members = set(new_data["members"])

=== modified file 'landscape/user/management.py'
--- landscape/user/management.py	2013-09-18 07:52:46 +0000
+++ landscape/user/management.py	2017-03-10 15:29:37 +0000
@@ -4,11 +4,10 @@
 # subprocesses. liboobs (i.e. System Tools) is a possibility, and has
 # documentation now in the 2.17 series, but is not wrapped to Python.
 
-import os
 import logging
 import subprocess
+from passlib.hash import md5_crypt
 
-from landscape.lib import md5crypt
 from landscape.user.provider import UserManagementError, UserProvider
 
 
@@ -52,8 +51,7 @@
         # XXX temporary workaround? We're getting unicode here.
         username = username.encode("ascii")
         password = password.encode("ascii")
-        salt = os.urandom(6).encode("base64")[:-1]
-        crypted = md5crypt.md5crypt(password, salt)
+        crypted = md5_crypt.encrypt(password)
         result, output = self.call_popen(["usermod", "-p", crypted, username])
         if result != 0:
             raise UserManagementError("Error setting password for user "

=== modified file 'landscape/user/provider.py'
--- landscape/user/provider.py	2008-06-12 17:46:35 +0000
+++ landscape/user/provider.py	2017-03-10 15:29:37 +0000
@@ -1,8 +1,10 @@
+from grp import struct_group
 from pwd import struct_passwd
-from grp import struct_group
 import csv
+import logging
 import subprocess
-import logging
+
+from twisted.python.compat import _PY3
 
 
 class UserManagementError(Exception):
@@ -31,7 +33,7 @@
 
         Each user is represented as a dict with the keys: C{username},
         C{name}, C{uid}, C{enabled}, C{location}, C{work-phone} and
-        C{home-phone}.  
+        C{home-phone}.
         """
         users = []
         found_usernames = set()
@@ -40,8 +42,7 @@
                 user = struct_passwd(user)
             if user.pw_name in found_usernames:
                 continue
-            gecos_data = [x.decode("utf-8", "replace") or None
-                          for x in user.pw_gecos.split(",")[:4]]
+            gecos_data = [x or None for x in user.pw_gecos.split(",")[:4]]
             while len(gecos_data) < 4:
                 gecos_data.append(None)
             name, location, work_phone, home_phone = tuple(gecos_data)
@@ -70,7 +71,7 @@
                 continue
             member_names = user_names.intersection(group.gr_mem)
             groups.append({"name": group.gr_name, "gid": group.gr_gid,
-                           "members": list(member_names)})
+                           "members": sorted(list(member_names))})
             found_groupnames.add(group.gr_name)
         return groups
 
@@ -96,6 +97,7 @@
                 return data["gid"]
         raise GroupNotFoundError("Group not found for group %s." % groupname)
 
+
 class UserProvider(UserProviderBase):
 
     popen = subprocess.Popen
@@ -117,26 +119,32 @@
         directory, path to the user's shell)
         """
         user_data = []
-        passwd_file = open(self._passwd_file, "r")
-        reader = csv.DictReader(passwd_file, fieldnames=self.passwd_fields,
-                                delimiter=":", quoting=csv.QUOTE_NONE)
-        current_line = 0
-        for row in reader:
-            current_line += 1
-            # This skips the NIS user marker in the passwd file.
-            if (row["username"].startswith("+") or
-                row["username"].startswith("-")):
-                continue
-            try:
-                user_data.append((row["username"], row["passwd"],
-                                  int(row["uid"]), int(row["primary-gid"]),
-                                  row["gecos"], row["home"], row["shell"]))
-            except (ValueError, TypeError):
-
-                logging.warn("passwd file %s is incorrectly formatted: "
-                             "line %d." % (self._passwd_file, current_line))
-
-        passwd_file.close()
+        if _PY3:
+            open_params = dict(errors='replace')
+        else:
+            open_params = dict()
+        with open(self._passwd_file, "r", **open_params) as passwd_file:
+            reader = csv.DictReader(
+                passwd_file, fieldnames=self.passwd_fields, delimiter=":",
+                quoting=csv.QUOTE_NONE)
+            current_line = 0
+            for row in reader:
+                current_line += 1
+                # This skips the NIS user marker in the passwd file.
+                if (row["username"].startswith("+") or
+                        row["username"].startswith("-")):
+                    continue
+                gecos = row["gecos"]
+                if not _PY3 and gecos is not None:
+                    gecos = gecos.decode("utf-8", "replace")
+                try:
+                    user_data.append((row["username"], row["passwd"],
+                                      int(row["uid"]), int(row["primary-gid"]),
+                                      gecos, row["home"], row["shell"]))
+                except (ValueError, TypeError):
+                    logging.warn(
+                        "passwd file %s is incorrectly formatted: line %d."
+                        % (self._passwd_file, current_line))
         return user_data
 
     def get_group_data(self):
@@ -157,11 +165,10 @@
                 row["name"].startswith("-")):
                 continue
             try:
-                group_data.append((row["name"], row["passwd"], int(row["gid"]), 
+                group_data.append((row["name"], row["passwd"], int(row["gid"]),
                                    row["members"].split(",")))
             except (AttributeError, ValueError):
                 logging.warn("group file %s is incorrectly formatted: "
                              "line %d." % (self._group_file, current_line))
         group_file.close()
         return group_data
- 

=== modified file 'landscape/user/tests/helpers.py'
--- landscape/user/tests/helpers.py	2016-02-08 13:49:49 +0000
+++ landscape/user/tests/helpers.py	2017-03-10 15:29:37 +0000
@@ -1,3 +1,5 @@
+from twisted.python.compat import iteritems, itervalues
+
 from landscape.user.management import UserManagementError
 from landscape.user.provider import UserProviderBase
 
@@ -29,7 +31,7 @@
         try:
             uid = 1000
             if self._users:
-                uid = max([x["uid"] for x in self._users.itervalues()]) + 1
+                uid = max([x["uid"] for x in itervalues(self._users)]) + 1
             if self._groups:
                 primary_gid = self.get_gid(primary_group_name)
             else:
@@ -108,7 +110,7 @@
     def add_group(self, name):
         gid = 1000
         if self._groups:
-            gid = max([x["gid"] for x in self._groups.itervalues()]) + 1
+            gid = max([x["gid"] for x in itervalues(self._groups)]) + 1
         self._groups[name] = {"name": name, "gid": gid, "members": []}
         self.update_provider_from_groups()
         return "add_group succeeded"
@@ -144,7 +146,7 @@
 
     def update_provider_from_groups(self):
         provider_list = []
-        for k, v in self._groups.iteritems():
+        for k, v in iteritems(self._groups):
             provider_list.append((k, "x", v["gid"], v["members"]))
         self.provider.groups = provider_list
 

=== modified file 'landscape/user/tests/test_management.py'
--- landscape/user/tests/test_management.py	2011-07-05 05:09:11 +0000
+++ landscape/user/tests/test_management.py	2017-03-10 15:29:37 +0000
@@ -1,13 +1,13 @@
-from landscape.lib import md5crypt
 from landscape.user.management import UserManagement, UserManagementError
 from landscape.user.tests.helpers import FakeUserProvider
 from landscape.user.provider import UserNotFoundError, GroupNotFoundError
 from landscape.tests.helpers import LandscapeTest, MockPopen
+from passlib.hash import md5_crypt
 
 
 def guess_password(generated_password, plaintext_password):
     salt = generated_password[len("$1$"):generated_password.rfind("$")]
-    crypted = md5crypt.md5crypt(plaintext_password, salt)
+    crypted = md5_crypt.encrypt(plaintext_password, salt=salt)
     return crypted
 
 

=== modified file 'landscape/user/tests/test_provider.py'
--- landscape/user/tests/test_provider.py	2011-07-05 05:09:11 +0000
+++ landscape/user/tests/test_provider.py	2017-03-10 15:29:37 +0000
@@ -1,13 +1,14 @@
 import pwd
 import grp
 
-from landscape.user.provider import (UserProvider, UserNotFoundError,
-    GroupNotFoundError)
-
+from twisted.python.compat import _PY3
+
+from landscape.user.provider import (
+    UserProvider, UserNotFoundError, GroupNotFoundError)
+
+from landscape.tests.helpers import LandscapeTest
 from landscape.user.tests.helpers import FakeUserProvider
 
-from landscape.tests.helpers import LandscapeTest
-
 
 class ProviderTest(LandscapeTest):
 
@@ -131,12 +132,19 @@
         name = u"Jos\N{LATIN SMALL LETTER E WITH ACUTE}"
         location = "F\N{LATIN SMALL LETTER I WITH DIAERESIS}nland"
         number = "N\N{LATIN SMALL LETTER AE}ver"
-        gecos = "%s,%s,%s,%s," % (name.encode("utf-8"),
-                                  location.encode("utf-8"),
-                                  number.encode("utf-8"),
-                                  number.encode("utf-8"))
-        data = [("jdoe", "x", 1000, 1000, gecos, "/home/jdoe", "/bin/zsh")]
-        provider = FakeUserProvider(users=data, shadow_file=self.shadow_file)
+        if _PY3:
+            gecos = "{},{},{},{},".format(name, location, number, number)
+        else:
+            gecos = "{},{},{},{},".format(name.encode("utf-8"),
+                                          location.encode("utf-8"),
+                                          number.encode("utf-8"),
+                                          number.encode("utf-8"))
+        passwd_file = self.makeFile("""\
+jdoe:x:1000:1000:{}:/home/jdoe:/bin/zsh
+root:x:0:0:root:/root:/bin/bash
+""".format(gecos))
+        provider = UserProvider(passwd_file=passwd_file,
+                                group_file=self.group_file)
         users = provider.get_users()
         self.assertEqual(users[0]["name"], name)
         self.assertEqual(users[0]["location"], location)
@@ -148,10 +156,14 @@
         If a GECOS field contains non-UTF8 data, it should be replaced
         with question marks.
         """
+        passwd_file = self.makeFile(b"""\
+jdoe:x:1000:1000:\255,\255,\255,\255:/home/jdoe:/bin/zsh
+root:x:0:0:root:/root:/bin/bash
+""", mode="wb")
+        provider = UserProvider(passwd_file=passwd_file,
+                                group_file=self.group_file)
         unicode_unknown = u'\N{REPLACEMENT CHARACTER}'
-        data = [("jdoe", "x", 1000, 1000, "\255,\255,\255,\255", "/home/jdoe",
-                 "/bin/zsh")]
-        provider = FakeUserProvider(users=data, shadow_file=self.shadow_file)
+        provider = UserProvider(passwd_file=passwd_file, group_file=None)
         users = provider.get_users()
         self.assertEqual(users[0]["name"], unicode_unknown)
         self.assertEqual(users[0]["location"], unicode_unknown)
@@ -180,8 +192,7 @@
         for user in users:
             if user["username"] == user_0.pw_name:
                 self.assertEqual(user["uid"], 0)
-                user_0_name = user_0.pw_gecos.split(",")[0].decode(
-                    "utf-8", "replace")
+                user_0_name = user_0.pw_gecos.split(",")[0]
                 self.assertEqual(user["name"], user_0_name)
                 break
         else:
@@ -390,7 +401,7 @@
                                      "members": []})
         self.assertEqual(groups[1], {"name": u"cdrom",
                                      "gid": 24,
-                                     "members": [u"kevin", u"haldaemon"]})
+                                     "members": [u"haldaemon", u"kevin"]})
         self.assertEqual(groups[2], {"name": u"kevin",
                                      "gid": 1000,
                                      "members": []})

=== modified file 'landscape/watchdog.py'
--- landscape/watchdog.py	2017-01-05 11:19:41 +0000
+++ landscape/watchdog.py	2017-03-10 15:29:37 +0000
@@ -480,12 +480,12 @@
     if os.fork():  # launch child and...
         os._exit(0)  # kill off parent again.
     # some argue that this umask should be 0, but that's annoying.
-    os.umask(077)
+    os.umask(0o077)
     null = os.open('/dev/null', os.O_RDWR)
     for i in range(3):
         try:
             os.dup2(null, i)
-        except OSError, e:
+        except OSError as e:
             if e.errno != errno.EBADF:
                 raise
     os.close(null)
@@ -576,20 +576,20 @@
 
 
 bootstrap_list = BootstrapList([
-    BootstrapDirectory("$data_path", "landscape", "root", 0755),
-    BootstrapDirectory("$data_path/package", "landscape", "root", 0755),
-    BootstrapDirectory(
-        "$data_path/package/hash-id", "landscape", "root", 0755),
-    BootstrapDirectory(
-        "$data_path/package/binaries", "landscape", "root", 0755),
-    BootstrapDirectory(
-        "$data_path/package/upgrade-tool", "landscape", "root", 0755),
-    BootstrapDirectory("$data_path/messages", "landscape", "root", 0755),
-    BootstrapDirectory("$data_path/sockets", "landscape", "root", 0750),
-    BootstrapDirectory(
-        "$data_path/custom-graph-scripts", "landscape", "root", 0755),
-    BootstrapDirectory("$log_dir", "landscape", "root", 0755),
-    BootstrapFile("$data_path/package/database", "landscape", "root", 0644)])
+    BootstrapDirectory("$data_path", "landscape", "root", 0o755),
+    BootstrapDirectory("$data_path/package", "landscape", "root", 0o755),
+    BootstrapDirectory(
+        "$data_path/package/hash-id", "landscape", "root", 0o755),
+    BootstrapDirectory(
+        "$data_path/package/binaries", "landscape", "root", 0o755),
+    BootstrapDirectory(
+        "$data_path/package/upgrade-tool", "landscape", "root", 0o755),
+    BootstrapDirectory("$data_path/messages", "landscape", "root", 0o755),
+    BootstrapDirectory("$data_path/sockets", "landscape", "root", 0o750),
+    BootstrapDirectory(
+        "$data_path/custom-graph-scripts", "landscape", "root", 0o755),
+    BootstrapDirectory("$log_dir", "landscape", "root", 0o755),
+    BootstrapFile("$data_path/package/database", "landscape", "root", 0o644)])
 
 
 def clean_environment():
@@ -600,7 +600,7 @@
     postinst script.  Some environment variables may be set which would affect
     *other* maintainer scripts which landscape-client invokes.
     """
-    for key in os.environ.keys():
+    for key in list(os.environ.keys()):
         if (key.startswith(("DEBIAN_", "DEBCONF_")) or
                 key in ["LANDSCAPE_ATTACHMENTS", "MAIL"]):
             del os.environ[key]

=== added file 'trial5'
--- trial5	1970-01-01 00:00:00 +0000
+++ trial5	2017-03-10 15:29:37 +0000
@@ -0,0 +1,11 @@
+echo -e "\e[1m\e[43m\e[34m          \e[93m\e[44m     \e[0m"
+echo -e "\e[1m\e[43m\e[34m  PYTHON  \e[93m\e[44m  2  \e[0m"
+echo -e "\e[1m\e[43m\e[34m          \e[93m\e[44m     \e[0m"
+echo "-------------------------------------------------------------------------------"
+trial  --unclean-warnings $@
+echo -e "\e[1m\e[93m\e[44m          \e[43m\e[34m     \e[0m"
+echo -e "\e[1m\e[93m\e[44m  PYTHON  \e[43m\e[34m  3  \e[0m"
+echo -e "\e[1m\e[93m\e[44m          \e[43m\e[34m     \e[0m"
+echo "-------------------------------------------------------------------------------"
+trial3 --unclean-warnings $@
+