Merge lp:~zyga/checkbox/ppa-packaging-plainbox into lp:checkbox

[Zygmunt Krynicki]

This makes plainbox co-installable with python3-plainbox which actually should carry that particular manual page

[lp:~zyga/checkbox/ppa-packaging-plainbox]

9. By Zygmunt Krynicki on 2014-07-23

"automatic merge by tarmac [r=zkrynicki][bug=][author=zkrynicki]"

10. By Sylvain Pineau on 2014-08-01

"Release_2014_Week31 [r=sylvain-pineau][bug=][author=checkbox-dev]"

11. By Daniel Manrique on 2014-08-15

"Release_2014_Week33 [r=roadmr][bug=][author=checkbox-dev]"

12. By Daniel Manrique on 2014-08-29

"Release_2014_Week35 [r=roadmr][bug=][author=checkbox-dev]"

13. By Sylvain Pineau on 2014-09-14

"Release_2014_Week37 [r=sylvain-pineau][bug=][author=checkbox-dev]"

14. By Daniel Manrique on 2014-09-26

"Release_2014_Week39 [r=roadmr][bug=][author=checkbox-dev]"

15. By Daniel Manrique on 2014-09-30

"Add tag and changelog entry for 0.13.1 upstream release with critical bugfixes. [r=roadmr][bug=][author=roadmr]"

16. By Sylvain Pineau on 2014-10-12

"Release_2014_Week41 [r=sylvain-pineau][bug=][author=checkbox-dev]"

17. By Sylvain Pineau on 2014-10-27

"Release_2014_Week44 [r=sylvain-pineau][bug=][author=checkbox-dev]"

18. By Sylvain Pineau on 2014-11-07

New upstream release

19. By Sylvain Pineau on 2014-11-07

Open 0.17 for development

20. By Sylvain Pineau on 2014-12-07

"Release_2014_Week49 [r=sylvain-pineau][bug=][author=checkbox-dev]"

21. By Sylvain Pineau on 2015-01-13

"Release_2015_Week3 [r=sylvain-pineau][bug=][author=checkbox-dev]"

22. By Sylvain Pineau on 2015-01-26

"Release_2015_Week5 [r=sylvain-pineau][bug=][author=checkbox-dev]"

23. By Maciej Kisielewski on 2015-01-30

"automatic merge of lp:~kissiel/checkbox/ppa-packaging-plainbox/ by tarmac [r=sylvain-pineau][bug=][author=kissiel]"

24. By Zygmunt Krynicki on 2015-02-03

"automatic merge of lp:~zkrynicki/checkbox/ppa-packaging-plainbox/ by tarmac [r=roadmr][bug=][author=zkrynicki]"

25. By Sylvain Pineau on 2015-03-09

"Release_2015_Week11 [r=sylvain-pineau][bug=][author=checkbox-dev]"

26. By Sylvain Pineau on 2015-04-01

"automatic merge of lp:~sylvain-pineau/checkbox/ppa-packaging-plainbox-python3-jinja2/ by tarmac [r=zyga][bug=][author=sylvain-pineau]"

27. By Zygmunt Krynicki on 2015-04-08

"automatic merge of lp:~zyga/checkbox/ppa-packaging-plainbox/ by tarmac [r=roadmr][bug=][author=zyga]"

28. By Zygmunt Krynicki on 2015-04-21

"automatic merge of lp:~zyga/checkbox/ppa-packaging-plainbox/ by tarmac [r=sylvain-pineau][bug=][author=zyga]"

29. By Sylvain Pineau on 2015-04-27

"Release_2015_Week18 [r=sylvain-pineau][bug=][author=checkbox-dev]"

30. By Sylvain Pineau on 2015-06-25

"automatic merge of lp:~sylvain-pineau/checkbox/ppa-packaging-plainbox-libxml2-removal/ by tarmac [r=sylvain-pineau][bug=][author=sylvain-pineau]"

31. By Sylvain Pineau on 2015-06-25

"automatic merge of lp:~sylvain-pineau/checkbox/ppa-packaging-plainbox-libxml2-removal/ by tarmac [r=sylvain-pineau][bug=][author=sylvain-pineau]"

32. By Sylvain Pineau on 2015-07-13

"Release_2015_Week29 [r=sylvain-pineau][bug=][author=checkbox-dev]"

33. By Zygmunt Krynicki on 2015-08-06

Add a build and runtime dependency on python3-requests.

Unmerged revisions

33. By Zygmunt Krynicki on 2015-08-06

Add a build and runtime dependency on python3-requests.

32. By Sylvain Pineau on 2015-07-13

"Release_2015_Week29 [r=sylvain-pineau][bug=][author=checkbox-dev]"

31. By Sylvain Pineau on 2015-06-25

"automatic merge of lp:~sylvain-pineau/checkbox/ppa-packaging-plainbox-libxml2-removal/ by tarmac [r=sylvain-pineau][bug=][author=sylvain-pineau]"

30. By Sylvain Pineau on 2015-06-25

"automatic merge of lp:~sylvain-pineau/checkbox/ppa-packaging-plainbox-libxml2-removal/ by tarmac [r=sylvain-pineau][bug=][author=sylvain-pineau]"

29. By Sylvain Pineau on 2015-04-27

"Release_2015_Week18 [r=sylvain-pineau][bug=][author=checkbox-dev]"

28. By Zygmunt Krynicki on 2015-04-21

"automatic merge of lp:~zyga/checkbox/ppa-packaging-plainbox/ by tarmac [r=sylvain-pineau][bug=][author=zyga]"

27. By Zygmunt Krynicki on 2015-04-08

"automatic merge of lp:~zyga/checkbox/ppa-packaging-plainbox/ by tarmac [r=roadmr][bug=][author=zyga]"

26. By Sylvain Pineau on 2015-04-01

"automatic merge of lp:~sylvain-pineau/checkbox/ppa-packaging-plainbox-python3-jinja2/ by tarmac [r=zyga][bug=][author=sylvain-pineau]"

25. By Sylvain Pineau on 2015-03-09

"Release_2015_Week11 [r=sylvain-pineau][bug=][author=checkbox-dev]"

24. By Zygmunt Krynicki on 2015-02-03

"automatic merge of lp:~zkrynicki/checkbox/ppa-packaging-plainbox/ by tarmac [r=roadmr][bug=][author=zkrynicki]"

=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2014-07-23 14:09:06 +0000
@@ -0,0 +1,112 @@
+plainbox (0.9) UNRELEASED; urgency=medium
+
+  [ Sylvain Pineau ]
+  * Open for development (remove this message before releasing)
+
+  [ Zygmunt Krynicki ]
+  * Add all of the new manual pages to the plainbox package. 
+
+ -- Sylvain Pineau <[e-mail]>  Sat, 19 Jul 2014 20:57:12 +0200
+
+plainbox (0.8) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Sylvain Pineau <[e-mail]>  Sat, 19 Jul 2014 20:56:54 +0200
+
+plainbox (0.7) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Sylvain Pineau <[e-mail]>  Mon, 07 Jul 2014 20:52:17 +0200
+
+plainbox (0.6) unstable; urgency=medium
+
+  * debian/control: make python3-plainbox, plainbox, plainbox-secure-policy
+    and plainbox-insecure-policy all depend on one version on themselves.
+    LP: #1298284
+  * fork of Debian packaging at 0.5.1-2 (unreleased) for PPA-specific builds
+  * debian/control: don't depend on dh-python
+  * debian/rules: don't use pybuild, do everything manually 
+  * debian/plainbox.install, debian/python3-plainbox.install: install required
+    files manually without relying on pybuild
+  * debian/control: don't depend and build-depend on python3-requests,
+    plainbox doesn't depend on it anymore 
+  * debian/control: break checkbox-ng << 0.3 (synchronized from debian) 
+  * debian/control: build-depend on policykit-1 (LP: #1319442) 
+
+ -- Sylvain Pineau <[e-mail]>  Mon, 16 Jun 2014 14:29:16 +0200
+
+plainbox (0.5.1-1) unstable; urgency=medium
+
+  * New upstream release
+  * debian/control: drop X-Python3-Version << 3.5 
+  * debian/patches/disable-development-option: dropped, applied upstream
+  * debian/copyright: associate vendorized copies of argparse with appropriate
+    copyright section
+
+ -- Zygmunt Krynicki <[e-mail]>  Wed, 19 Mar 2014 00:08:12 +0100
+
+plainbox (0.5~b2-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/control: build-depend on python3-distutils-extra for translations
+  * debian/control: add support for python3.4
+  * debian/control: drop build dependency on help2man, the new release has
+    native manual pages
+  * debian/rules: build, install and clean up after translations
+  * debian/clean: clean *.egg-info and *.pot files since those get
+    regenerated
+  * debian/source/options: ignore changes to .po files since intltools-update
+    keeps bumping the timestamp embedded in them
+  * debian/copyright: add license section for plainbox/impl/_argparse.py
+  * debian/copyright: add new copyright entries for textland
+  * debian/patches: refresh and reorder without any semantic changes
+  * debian/patches: add patch to revert documentation theme to defaults
+  * debian/watch: add mangling for alpha releases
+  * debian/python3-plainbox.manpages, debian/plainbox.manpages: use manual
+    pages build with sphinx
+
+ -- Zygmunt Krynicki <[e-mail]>  Thu, 13 Mar 2014 09:45:06 +0100
+
+plainbox (0.4-4) unstable; urgency=medium
+
+  * Team upload.
+  * Autopkgtest improvements: enable verbose output, use $ADTTMP and stop
+    redirecting output to /dev/null.
+  * Export NO_PNG_PKG_MANGLE=1 in debian/rules to disable PNG stripping
+    when pkgbinarymangler is installed (it breaks the testsuite).
+
+ -- Dmitry Shachnev <[e-mail]>  Wed, 22 Jan 2014 18:08:40 +0400
+
+plainbox (0.4-3) unstable; urgency=medium
+
+  * debian/tests/unit-tests: actually fail the test suite if unit tests fail.
+    Thanks to Michael Terry for the fix. LP:#1265853
+
+ -- Zygmunt Krynicki <[e-mail]>  Fri, 03 Jan 2014 16:55:54 +0100
+
+plainbox (0.4-2) unstable; urgency=medium
+
+  * debian/tests/control: Fix autopackage tests not to install all (including
+    conflicting) packages blindly LP:#1264985
+
+ -- Zygmunt Krynicki <[e-mail]>  Thu, 02 Jan 2014 10:33:29 +0100
+
+plainbox (0.4-1) unstable; urgency=medium
+
+  * New upstream release
+  * plainbox-insecure-policy.install, plainbox-secure-policy.install: adjust
+    packaging to install the same policykit .policy files under their new
+    names
+  * debian/copyright: update all Canonical-owned code to GPL-3 (not GPL-3+)
+  * debian/control: mark python3.4 as unsupported as python3-lxml does not
+    support python3.4 yet
+
+ -- Zygmunt Krynicki <[e-mail]>  Tue, 24 Dec 2013 14:27:09 +0100
+
+plainbox (0.4~b2-1) unstable; urgency=low
+
+  * Initial release (Closes: #730568)
+
+ -- Zygmunt Krynicki <[e-mail]>  Thu, 28 Nov 2013 23:38:28 +0000

=== added file 'debian/clean'
--- debian/clean	1970-01-01 00:00:00 +0000
+++ debian/clean	2014-07-23 14:09:06 +0000
@@ -0,0 +1,3 @@
+*.egg-info
+plainbox/impl/providers/stubbox/po/stubbox.pot
+po/plainbox.pot

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2014-07-23 14:09:06 +0000
@@ -0,0 +1,1 @@
+9

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2014-07-23 14:09:06 +0000
@@ -0,0 +1,176 @@
+Source: plainbox
+Section: utils
+Priority: optional
+Maintainer: Zygmunt Krynicki <[e-mail]>
+Uploaders: Debian Python Modules Team <[e-mail]>
+Build-Depends:
+ debhelper (>= 9),
+ policykit-1,
+ python3-all,
+ python3-distutils-extra,
+ python3-docutils,
+ python3-lxml,
+ python3-pkg-resources,
+ python3-setuptools,
+ python3-sphinx,
+Standards-Version: 3.9.5
+X-Python3-Version: >= 3.2
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/plainbox/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/plainbox/trunk/
+XS-Testsuite: autopkgtest
+Homepage: http://launchpad.net/checkbox
+
+Package: plainbox
+Architecture: all
+Depends:
+ ${misc:Depends},
+ ${python3:Depends},
+ python3-pkg-resources,
+ python3-plainbox (= ${binary:Version})
+Description: toolkit for software and hardware integration testing
+ PlainBox is a toolkit consisting of python3 library, development tools,
+ documentation and examples. It is targeted at developers working on testing or
+ certification applications and authors creating tests for such applications.
+ .
+ PlainBox can be used to both create simple and comprehensive test tools as
+ well as to develop and execute test jobs and test scenarios. It was created as
+ a refined and rewritten core of the Checkbox project. It has a well tested and
+ documented core, small but active development community and a collection of
+ associated projects that use it as a lower-level engine/back-end library.
+ .
+ PlainBox has a novel approach to discovering (and probing) hardware and
+ software that is extensible and not hardwired into the system. It allows test
+ developers to express association between a particular test and the hardware,
+ software and configuration constraints that must be met for the test to
+ execute meaningfully. This feature, along with pluggable test definitions,
+ makes plainbox flexible and applicable to many diverse testing situations,
+ ranging from mobile phones, traditional desktop computers, servers and up to
+ testing "cloud" installations.
+ .
+ This package contains the plainbox executable
+
+Package: python3-plainbox
+Architecture: all
+Section: python
+Depends:
+ ${misc:Depends},
+ ${python3:Depends},
+ plainbox-secure-policy (= ${binary:Version}) | plainbox-insecure-policy (= ${binary:Version}),
+ policykit-1,
+ python3-lxml,
+ python3-pkg-resources,
+Suggests:
+ python3-xlsxwriter
+Breaks:
+ python3-checkbox-ng (<< 0.3)
+Description: toolkit for software and hardware testing (python3 module)
+ PlainBox is a toolkit consisting of python3 library, development tools,
+ documentation and examples. It is targeted at developers working on testing or
+ certification applications and authors creating tests for such applications.
+ .
+ PlainBox can be used to both create simple and comprehensive test tools as
+ well as to develop and execute test jobs and test scenarios. It was created as
+ a refined and rewritten core of the Checkbox project. It has a well tested and
+ documented core, small but active development community and a collection of
+ associated projects that use it as a lower-level engine/back-end library.
+ .
+ PlainBox has a novel approach to discovering (and probing) hardware and
+ software that is extensible and not hardwired into the system. It allows test
+ developers to express association between a particular test and the hardware,
+ software and configuration constraints that must be met for the test to
+ execute meaningfully. This feature, along with pluggable test definitions,
+ makes plainbox flexible and applicable to many diverse testing situations,
+ ranging from mobile phones, traditional desktop computers, servers and up to
+ testing "cloud" installations.
+ .
+ This package contains the plainbox python3 library.
+
+Package: python3-plainbox-doc
+Architecture: all
+Section: doc
+Priority: extra
+Depends:
+ ${misc:Depends},
+ ${sphinxdoc:Depends}
+Description: toolkit for software and hardware testing (documentation)
+ PlainBox is a toolkit consisting of python3 library, development tools,
+ documentation and examples. It is targeted at developers working on testing or
+ certification applications and authors creating tests for such applications.
+ .
+ PlainBox can be used to both create simple and comprehensive test tools as
+ well as to develop and execute test jobs and test scenarios. It was created as
+ a refined and rewritten core of the Checkbox project. It has a well tested and
+ documented core, small but active development community and a collection of
+ associated projects that use it as a lower-level engine/back-end library.
+ .
+ PlainBox has a novel approach to discovering (and probing) hardware and
+ software that is extensible and not hardwired into the system. It allows test
+ developers to express association between a particular test and the hardware,
+ software and configuration constraints that must be met for the test to
+ execute meaningfully. This feature, along with pluggable test definitions,
+ makes plainbox flexible and applicable to many diverse testing situations,
+ ranging from mobile phones, traditional desktop computers, servers and up to
+ testing "cloud" installations.
+ .
+ This package contains the documentation for the plainbox python3 library
+
+Package: plainbox-secure-policy
+Architecture: all
+Depends: ${misc:Depends},
+Conflicts: plainbox-insecure-policy
+Replaces: plainbox-insecure-policy
+Description: policykit policy required to use plainbox (secure version)
+ PlainBox is a toolkit consisting of python3 library, development tools,
+ documentation and examples. It is targeted at developers working on testing or
+ certification applications and authors creating tests for such applications.
+ .
+ PlainBox can be used to both create simple and comprehensive test tools as
+ well as to develop and execute test jobs and test scenarios. It was created as
+ a refined and rewritten core of the Checkbox project. It has a well tested and
+ documented core, small but active development community and a collection of
+ associated projects that use it as a lower-level engine/back-end library.
+ .
+ PlainBox has a novel approach to discovering (and probing) hardware and
+ software that is extensible and not hardwired into the system. It allows test
+ developers to express association between a particular test and the hardware,
+ software and configuration constraints that must be met for the test to
+ execute meaningfully. This feature, along with pluggable test definitions,
+ makes plainbox flexible and applicable to many diverse testing situations,
+ ranging from mobile phones, traditional desktop computers, servers and up to
+ testing "cloud" installations.
+ .
+ This package contains a PolicyKit .policy file that allows PlainBox to run
+ plainbox-trusted-launcher-1 as root and ask for the user password only once
+ per session.
+
+Package: plainbox-insecure-policy
+Architecture: all
+Depends: ${misc:Depends},
+Conflicts: plainbox-secure-policy
+Replaces: plainbox-secure-policy
+Description: policykit policy required to use plainbox (insecure version)
+ PlainBox is a toolkit consisting of python3 library, development tools,
+ documentation and examples. It is targeted at developers working on testing or
+ certification applications and authors creating tests for such applications.
+ .
+ PlainBox can be used to both create simple and comprehensive test tools as
+ well as to develop and execute test jobs and test scenarios. It was created as
+ a refined and rewritten core of the Checkbox project. It has a well tested and
+ documented core, small but active development community and a collection of
+ associated projects that use it as a lower-level engine/back-end library.
+ .
+ PlainBox has a novel approach to discovering (and probing) hardware and
+ software that is extensible and not hardwired into the system. It allows test
+ developers to express association between a particular test and the hardware,
+ software and configuration constraints that must be met for the test to
+ execute meaningfully. This feature, along with pluggable test definitions,
+ makes plainbox flexible and applicable to many diverse testing situations,
+ ranging from mobile phones, traditional desktop computers, servers and up to
+ testing "cloud" installations.
+ .
+ Note that installing this package will allow *any* local user to execute any
+ of the plainbox jobs (test definitions), also installed on the same machine
+ (in system-wide locations), without any confirmation. You should only install
+ this package on machines where that is not a security problem. Typically this
+ package is installed on test machines inside automatically deployed test
+ farms.

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2014-07-23 14:09:06 +0000
@@ -0,0 +1,166 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: plainbox
+Source: https://launchpad.net/checkbox
+
+Files: *
+Copyright: Copyright 2012-2013 Canonical Ltd.
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 3,
+ as published by the Free Software Foundation.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian-based systems the full text of the GPL, version 3, can be found at
+ /usr/share/common-licenses/GPL-3.
+
+Files: plainbox/impl/vendor/textland/*
+Copyright:
+ Copyright (c) 2014 Canonical Ltd.
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian-based systems the full text of the GPL, version 3, can be found at
+ /usr/share/common-licenses/GPL-3.
+
+Files: plainbox/impl/vendor/extcmd/*
+Copyright:
+ Copyright (c) 2010-2012 Linaro Limited
+ Copyright (c) 2013 Canonical Ltd.
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian-based systems the full text of the GPL, version 3, can be found at
+ /usr/share/common-licenses/GPL-3.
+
+Files: plainbox/impl/vendor/funcsigs/*
+Copyright:
+ Copyright 2013 Aaron Iles
+ Copyright 2001-2013 Python Software Foundation;
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+  http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian-based systems the full text of the Apache, version 2.0, can be found
+ at /usr/share/common-licenses/Apache-2.0.
+
+Files: plainbox/impl/vendor/mock.py
+Copyright: Copyright (C) 2007-2012 Michael Foord & the mock team
+License: BSD-3-clause
+ 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 Michael Foord nor the name of Voidspace
+      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.
+
+Files: plainbox/impl/_argparse.py
+Files: plainbox/vendor/argparse/*.py
+Copyright:
+ Steven J. Bethard <[e-mail]>.
+License: Python Software Foundation License Version 2 
+ PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+ --------------------------------------------
+ . 
+ 1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"),
+    and the Individual or Organization ("Licensee") accessing and otherwise
+    using this software ("Python") in source or binary form and its associated
+    documentation.
+ . 
+ 2. Subject to the terms and conditions of this License Agreement, PSF hereby
+    grants Licensee a nonexclusive, royalty-free, world-wide license to
+    reproduce, analyze, test, perform and/or display publicly, prepare
+    derivative works, distribute, and otherwise use Python alone or in any
+    derivative version, provided, however, that PSF's License Agreement and
+    PSF's notice of copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004,
+    2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Python Software
+    Foundation; All Rights Reserved" are retained in Python alone or in any
+    derivative version prepared by Licensee.
+ . 
+ 3. In the event Licensee prepares a derivative work that is based on or
+    incorporates Python or any part thereof, and wants to make the derivative
+    work available to others as provided herein, then Licensee hereby agrees
+    to include in any such work a brief summary of the changes made to Python.
+ . 
+ 4. PSF is making Python available to Licensee on an "AS IS" basis.  PSF MAKES
+    NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED.  BY WAY OF EXAMPLE,
+    BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR
+    WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
+    THE USE OF PYTHON WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
+ . 
+ 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON FOR ANY
+    INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
+    MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR ANY DERIVATIVE
+    THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+ . 
+ 6. This License Agreement will automatically terminate upon a material breach
+    of its terms and conditions.
+ . 
+ 7. Nothing in this License Agreement shall be deemed to create any
+    relationship of agency, partnership, or joint venture between PSF and
+    Licensee.  This License Agreement does not grant permission to use PSF
+    trademarks or trade name in a trademark sense to endorse or promote
+    products or services of Licensee, or any third party.
+ . 
+ 8. By copying, installing or otherwise using Python, Licensee agrees to be
+    bound by the terms and conditions of this License Agreement.
+ 

=== added directory 'debian/patches'
=== added file 'debian/patches/documentation-theme'
--- debian/patches/documentation-theme	1970-01-01 00:00:00 +0000
+++ debian/patches/documentation-theme	2014-07-23 14:09:06 +0000
@@ -0,0 +1,31 @@
+Description: Revert the documentation theme back to default
+ PlainBox uses a customized sphinx theme that includes additional
+ HTML to integrate with online comment service. This should not be
+ a part of the offline documentation package.
+Author: Zygmunt Krynicki <[e-mail]>
+Origin: upstream
+Forwarded: not-needed
+Last-Update: 2014-03-18
+
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -108,18 +108,11 @@
+ # Use our custom theme. For now it only adds Disqus.com support but we may
+ # customize it further later on. The theme is called 'plainbox' and has one
+ # option which controls if disqus is active or not.
+-html_theme = 'plainbox'
++html_theme = 'default'
+ 
+ # Theme options are theme-specific and customize the look and feel of a theme
+ # further.  For a list of options available for each theme, see the
+ # documentation.
+-#
+-# Due to the way disqus works, it's only going to work on
+-# plainbox.readthedocs.org so only use it if building for readthedocs.
+-
+-html_theme_options = {
+-    'show_disqus': 'true' if os.environ.get("READTHEDOCS", None) == 'True' else ''
+-}
+ 
+ # Add any paths that contain custom themes here, relative to this directory.
+ html_theme_path = ['_theme']

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2014-07-23 14:09:06 +0000
@@ -0,0 +1,3 @@
+unvendorize
+silence-logging-failure
+documentation-theme

=== added file 'debian/patches/silence-logging-failure'
--- debian/patches/silence-logging-failure	1970-01-01 00:00:00 +0000
+++ debian/patches/silence-logging-failure	2014-07-23 14:09:06 +0000
@@ -0,0 +1,24 @@
+Description: Silence setup failure of the logging subsystem
+ The logging subsystem has a feature that displays two lines of warnings
+ if the per-user log file cannot be created. This leads to spurious
+ errors when plainbox is invoked from a build environment. Before a
+ better solution is found this warning is disabled as all of the
+ subsequent, relevant, logging messages are display either way.
+Author: Zygmunt Krynicki <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/checkbox/+bug/1262898
+Forwarded: yes
+Last-Update: 2014-03-18
+
+--- a/plainbox/impl/logging.py
++++ b/plainbox/impl/logging.py
+@@ -94,10 +94,6 @@
+             try:
+                 os.makedirs(self.log_dir, exist_ok=True)
+             except OSError as error:
+-                logger.warning(
+-                    _("Unable to create log directory: %s"), self.log_dir)
+-                logger.warning(_("Reason: %s. All logs will go to "
+-                                 "console instead."), error)
+                 config_dict = self.DEFAULT_CONSOLE_ONLY_CONFIG
+         # Apply the selected configuration. This overrides anything currently
+         # defined for all of the logging subsystem in this python runtime

=== added file 'debian/patches/unvendorize'
--- debian/patches/unvendorize	1970-01-01 00:00:00 +0000
+++ debian/patches/unvendorize	2014-07-23 14:09:06 +0000
@@ -0,0 +1,3276 @@
+Description: Remove vendorized modules
+ This patch replaces plainbox.vendor.{mock,funcsigs} with equivalent
+ imports from the standard python3.3 library. Upstream will stop
+ shipping those vendorized modules when support for python3.2 is no
+ longer required.
+Author: Zygmunt Krynicki <[e-mail]>
+Upstream: not-needed
+Last-Update: 2014-03-18
+
+--- a/plainbox/vendor/__init__.py
++++ b/plainbox/vendor/__init__.py
+@@ -25,4 +25,9 @@
+ tree of another project) to simplify dependency management. There is no problem
+ with expressing those dependencies at pypi level but it would be annoying to
+ have to first package and introduce them to Ubuntu.
++
++.. note::
++    The ``plainbox.vendor`` package is modified by Debian not to ship a copy of
++    the ``unittest.mock`` and updated ``inspect`` modules that are already
++    available in python3.3
+ """
+--- a/plainbox/vendor/funcsigs/LICENSE
++++ /dev/null
+@@ -1,13 +0,0 @@
+-Copyright 2013 Aaron Iles
+-
+-Licensed under the Apache License, Version 2.0 (the "License");
+-you may not use this file except in compliance with the License.
+-You may obtain a copy of the License at
+-
+-  http://www.apache.org/licenses/LICENSE-2.0
+-
+-Unless required by applicable law or agreed to in writing, software
+-distributed under the License is distributed on an "AS IS" BASIS,
+-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-See the License for the specific language governing permissions and
+-limitations under the License.
+--- a/plainbox/vendor/funcsigs/__init__.py
++++ b/plainbox/vendor/funcsigs/__init__.py
+@@ -1,810 +1,29 @@
+-# Copyright 2001-2013 Python Software Foundation; All Rights Reserved
++# This file is part of Checkbox.
+ #
+-# MODIFICATIONS:
+-# - Vendorized for plainbox packaging needs.
+-#   See https://pypi.python.org/pypi/plainbox
+-# - Removed the odict.py module as plainbox only supports python3.2+
+-"""Function signature objects for callables
++# Copyright 2013 Canonical Ltd.
++# Written by:
++#   Zygmunt Krynicki <[e-mail]>
++#
++# Checkbox is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# Checkbox is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+ 
+-Back port of Python 3.3's function signature tools from the inspect module,
+-modified to be compatible with Python 2.6, 2.7 and 3.2+.
+ """
+-from __future__ import absolute_import, division, print_function
+-import itertools
+-import functools
+-import re
+-import types
+-
+-from collections import OrderedDict
+-
+-from plainbox.vendor.funcsigs.version import __version__
+-
+-__all__ = ['BoundArguments', 'Parameter', 'Signature', 'signature']
+-
+-
+-_WrapperDescriptor = type(type.__call__)
+-_MethodWrapper = type(all.__call__)
+-
+-_NonUserDefinedCallables = (_WrapperDescriptor,
+-                            _MethodWrapper,
+-                            types.BuiltinFunctionType)
+-
+-
+-def formatannotation(annotation, base_module=None):
+-    if isinstance(annotation, type):
+-        if annotation.__module__ in ('builtins', '__builtin__', base_module):
+-            return annotation.__name__
+-        return annotation.__module__+'.'+annotation.__name__
+-    return repr(annotation)
+-
+-
+-def _get_user_defined_method(cls, method_name, *nested):
+-    try:
+-        if cls is type:
+-            return
+-        meth = getattr(cls, method_name)
+-        for name in nested:
+-            meth = getattr(meth, name, meth)
+-    except AttributeError:
+-        return
+-    else:
+-        if not isinstance(meth, _NonUserDefinedCallables):
+-            # Once '__signature__' will be added to 'C'-level
+-            # callables, this check won't be necessary
+-            return meth
+-
+-
+-def signature(obj):
+-    '''Get a signature object for the passed callable.'''
+-
+-    if not callable(obj):
+-        raise TypeError('{0!r} is not a callable object'.format(obj))
+-
+-    if isinstance(obj, types.MethodType):
+-        # In this case we skip the first parameter of the underlying
+-        # function (usually `self` or `cls`).
+-        sig = signature(obj.__func__)
+-        return sig.replace(parameters=tuple(sig.parameters.values())[1:])
+-
+-    try:
+-        sig = obj.__signature__
+-    except AttributeError:
+-        pass
+-    else:
+-        if sig is not None:
+-            return sig
+-
+-    try:
+-        # Was this function wrapped by a decorator?
+-        wrapped = obj.__wrapped__
+-    except AttributeError:
+-        pass
+-    else:
+-        return signature(wrapped)
+-
+-    if isinstance(obj, types.FunctionType):
+-        return Signature.from_function(obj)
+-
+-    if isinstance(obj, functools.partial):
+-        sig = signature(obj.func)
+-
+-        new_params = OrderedDict(sig.parameters.items())
+-
+-        partial_args = obj.args or ()
+-        partial_keywords = obj.keywords or {}
+-        try:
+-            ba = sig.bind_partial(*partial_args, **partial_keywords)
+-        except TypeError as ex:
+-            msg = 'partial object {0!r} has incorrect arguments'.format(obj)
+-            raise ValueError(msg)
+-
+-        for arg_name, arg_value in ba.arguments.items():
+-            param = new_params[arg_name]
+-            if arg_name in partial_keywords:
+-                # We set a new default value, because the following code
+-                # is correct:
+-                #
+-                #   >>> def foo(a): print(a)
+-                #   >>> print(partial(partial(foo, a=10), a=20)())
+-                #   20
+-                #   >>> print(partial(partial(foo, a=10), a=20)(a=30))
+-                #   30
+-                #
+-                # So, with 'partial' objects, passing a keyword argument is
+-                # like setting a new default value for the corresponding
+-                # parameter
+-                #
+-                # We also mark this parameter with '_partial_kwarg'
+-                # flag.  Later, in '_bind', the 'default' value of this
+-                # parameter will be added to 'kwargs', to simulate
+-                # the 'functools.partial' real call.
+-                new_params[arg_name] = param.replace(default=arg_value,
+-                                                     _partial_kwarg=True)
+-
+-            elif (param.kind not in (_VAR_KEYWORD, _VAR_POSITIONAL) and
+-                            not param._partial_kwarg):
+-                new_params.pop(arg_name)
+-
+-        return sig.replace(parameters=new_params.values())
+-
+-    sig = None
+-    if isinstance(obj, type):
+-        # obj is a class or a metaclass
+-
+-        # First, let's see if it has an overloaded __call__ defined
+-        # in its metaclass
+-        call = _get_user_defined_method(type(obj), '__call__')
+-        if call is not None:
+-            sig = signature(call)
+-        else:
+-            # Now we check if the 'obj' class has a '__new__' method
+-            new = _get_user_defined_method(obj, '__new__')
+-            if new is not None:
+-                sig = signature(new)
+-            else:
+-                # Finally, we should have at least __init__ implemented
+-                init = _get_user_defined_method(obj, '__init__')
+-                if init is not None:
+-                    sig = signature(init)
+-    elif not isinstance(obj, _NonUserDefinedCallables):
+-        # An object with __call__
+-        # We also check that the 'obj' is not an instance of
+-        # _WrapperDescriptor or _MethodWrapper to avoid
+-        # infinite recursion (and even potential segfault)
+-        call = _get_user_defined_method(type(obj), '__call__', 'im_func')
+-        if call is not None:
+-            sig = signature(call)
+-
+-    if sig is not None:
+-        # For classes and objects we skip the first parameter of their
+-        # __call__, __new__, or __init__ methods
+-        return sig.replace(parameters=tuple(sig.parameters.values())[1:])
+-
+-    if isinstance(obj, types.BuiltinFunctionType):
+-        # Raise a nicer error message for builtins
+-        msg = 'no signature found for builtin function {0!r}'.format(obj)
+-        raise ValueError(msg)
+-
+-    raise ValueError('callable {0!r} is not supported by signature'.format(obj))
+-
+-
+-class _void(object):
+-    '''A private marker - used in Parameter & Signature'''
+-
+-
+-class _empty(object):
+-    pass
+-
+-
+-class _ParameterKind(int):
+-    def __new__(self, *args, **kwargs):
+-        obj = int.__new__(self, *args)
+-        obj._name = kwargs['name']
+-        return obj
+-
+-    def __str__(self):
+-        return self._name
+-
+-    def __repr__(self):
+-        return '<_ParameterKind: {0!r}>'.format(self._name)
+-
+-
+-_POSITIONAL_ONLY        = _ParameterKind(0, name='POSITIONAL_ONLY')
+-_POSITIONAL_OR_KEYWORD  = _ParameterKind(1, name='POSITIONAL_OR_KEYWORD')
+-_VAR_POSITIONAL         = _ParameterKind(2, name='VAR_POSITIONAL')
+-_KEYWORD_ONLY           = _ParameterKind(3, name='KEYWORD_ONLY')
+-_VAR_KEYWORD            = _ParameterKind(4, name='VAR_KEYWORD')
+-
+-
+-class Parameter(object):
+-    '''Represents a parameter in a function signature.
+-
+-    Has the following public attributes:
+-
+-    * name : str
+-        The name of the parameter as a string.
+-    * default : object
+-        The default value for the parameter if specified.  If the
+-        parameter has no default value, this attribute is not set.
+-    * annotation
+-        The annotation for the parameter if specified.  If the
+-        parameter has no annotation, this attribute is not set.
+-    * kind : str
+-        Describes how argument values are bound to the parameter.
+-        Possible values: `Parameter.POSITIONAL_ONLY`,
+-        `Parameter.POSITIONAL_OR_KEYWORD`, `Parameter.VAR_POSITIONAL`,
+-        `Parameter.KEYWORD_ONLY`, `Parameter.VAR_KEYWORD`.
+-    '''
+-
+-    __slots__ = ('_name', '_kind', '_default', '_annotation', '_partial_kwarg')
+-
+-    POSITIONAL_ONLY         = _POSITIONAL_ONLY
+-    POSITIONAL_OR_KEYWORD   = _POSITIONAL_OR_KEYWORD
+-    VAR_POSITIONAL          = _VAR_POSITIONAL
+-    KEYWORD_ONLY            = _KEYWORD_ONLY
+-    VAR_KEYWORD             = _VAR_KEYWORD
+-
+-    empty = _empty
+-
+-    def __init__(self, name, kind, default=_empty, annotation=_empty,
+-                 _partial_kwarg=False):
+-
+-        if kind not in (_POSITIONAL_ONLY, _POSITIONAL_OR_KEYWORD,
+-                        _VAR_POSITIONAL, _KEYWORD_ONLY, _VAR_KEYWORD):
+-            raise ValueError("invalid value for 'Parameter.kind' attribute")
+-        self._kind = kind
+-
+-        if default is not _empty:
+-            if kind in (_VAR_POSITIONAL, _VAR_KEYWORD):
+-                msg = '{0} parameters cannot have default values'.format(kind)
+-                raise ValueError(msg)
+-        self._default = default
+-        self._annotation = annotation
+-
+-        if name is None:
+-            if kind != _POSITIONAL_ONLY:
+-                raise ValueError("None is not a valid name for a "
+-                                 "non-positional-only parameter")
+-            self._name = name
+-        else:
+-            name = str(name)
+-            if kind != _POSITIONAL_ONLY and not re.match(r'[a-z_]\w*$', name, re.I):
+-                msg = '{0!r} is not a valid parameter name'.format(name)
+-                raise ValueError(msg)
+-            self._name = name
+-
+-        self._partial_kwarg = _partial_kwarg
+-
+-    @property
+-    def name(self):
+-        return self._name
+-
+-    @property
+-    def default(self):
+-        return self._default
+-
+-    @property
+-    def annotation(self):
+-        return self._annotation
+-
+-    @property
+-    def kind(self):
+-        return self._kind
+-
+-    def replace(self, name=_void, kind=_void, annotation=_void,
+-                default=_void, _partial_kwarg=_void):
+-        '''Creates a customized copy of the Parameter.'''
+-
+-        if name is _void:
+-            name = self._name
+-
+-        if kind is _void:
+-            kind = self._kind
+-
+-        if annotation is _void:
+-            annotation = self._annotation
+-
+-        if default is _void:
+-            default = self._default
+-
+-        if _partial_kwarg is _void:
+-            _partial_kwarg = self._partial_kwarg
+-
+-        return type(self)(name, kind, default=default, annotation=annotation,
+-                          _partial_kwarg=_partial_kwarg)
+-
+-    def __str__(self):
+-        kind = self.kind
+-
+-        formatted = self._name
+-        if kind == _POSITIONAL_ONLY:
+-            if formatted is None:
+-                formatted = ''
+-            formatted = '<{0}>'.format(formatted)
+-
+-        # Add annotation and default value
+-        if self._annotation is not _empty:
+-            formatted = '{0}:{1}'.format(formatted,
+-                                       formatannotation(self._annotation))
+-
+-        if self._default is not _empty:
+-            formatted = '{0}={1}'.format(formatted, repr(self._default))
+-
+-        if kind == _VAR_POSITIONAL:
+-            formatted = '*' + formatted
+-        elif kind == _VAR_KEYWORD:
+-            formatted = '**' + formatted
+-
+-        return formatted
+-
+-    def __repr__(self):
+-        return '<{0} at {1:#x} {2!r}>'.format(self.__class__.__name__,
+-                                           id(self), self.name)
+-
+-    def __hash__(self):
+-        msg = "unhashable type: '{0}'".format(self.__class__.__name__)
+-        raise TypeError(msg)
+-
+-    def __eq__(self, other):
+-        return (issubclass(other.__class__, Parameter) and
+-                self._name == other._name and
+-                self._kind == other._kind and
+-                self._default == other._default and
+-                self._annotation == other._annotation)
+-
+-    def __ne__(self, other):
+-        return not self.__eq__(other)
+-
++:mod:`plainbox.vendor.funcsigs` -- vendorized funcsigs module
++=============================================================
+ 
+-class BoundArguments(object):
+-    '''Result of `Signature.bind` call.  Holds the mapping of arguments
+-    to the function's parameters.
+-
+-    Has the following public attributes:
+-
+-    * arguments : OrderedDict
+-        An ordered mutable mapping of parameters' names to arguments' values.
+-        Does not contain arguments' default values.
+-    * signature : Signature
+-        The Signature object that created this instance.
+-    * args : tuple
+-        Tuple of positional arguments values.
+-    * kwargs : dict
+-        Dict of keyword arguments values.
+-    '''
+-
+-    def __init__(self, signature, arguments):
+-        self.arguments = arguments
+-        self._signature = signature
+-
+-    @property
+-    def signature(self):
+-        return self._signature
+-
+-    @property
+-    def args(self):
+-        args = []
+-        for param_name, param in self._signature.parameters.items():
+-            if (param.kind in (_VAR_KEYWORD, _KEYWORD_ONLY) or
+-                                                    param._partial_kwarg):
+-                # Keyword arguments mapped by 'functools.partial'
+-                # (Parameter._partial_kwarg is True) are mapped
+-                # in 'BoundArguments.kwargs', along with VAR_KEYWORD &
+-                # KEYWORD_ONLY
+-                break
+-
+-            try:
+-                arg = self.arguments[param_name]
+-            except KeyError:
+-                # We're done here. Other arguments
+-                # will be mapped in 'BoundArguments.kwargs'
+-                break
+-            else:
+-                if param.kind == _VAR_POSITIONAL:
+-                    # *args
+-                    args.extend(arg)
+-                else:
+-                    # plain argument
+-                    args.append(arg)
+-
+-        return tuple(args)
+-
+-    @property
+-    def kwargs(self):
+-        kwargs = {}
+-        kwargs_started = False
+-        for param_name, param in self._signature.parameters.items():
+-            if not kwargs_started:
+-                if (param.kind in (_VAR_KEYWORD, _KEYWORD_ONLY) or
+-                                                param._partial_kwarg):
+-                    kwargs_started = True
+-                else:
+-                    if param_name not in self.arguments:
+-                        kwargs_started = True
+-                        continue
+-
+-            if not kwargs_started:
+-                continue
+-
+-            try:
+-                arg = self.arguments[param_name]
+-            except KeyError:
+-                pass
+-            else:
+-                if param.kind == _VAR_KEYWORD:
+-                    # **kwargs
+-                    kwargs.update(arg)
+-                else:
+-                    # plain keyword argument
+-                    kwargs[param_name] = arg
+-
+-        return kwargs
+-
+-    def __hash__(self):
+-        msg = "unhashable type: '{0}'".format(self.__class__.__name__)
+-        raise TypeError(msg)
+-
+-    def __eq__(self, other):
+-        return (issubclass(other.__class__, BoundArguments) and
+-                self.signature == other.signature and
+-                self.arguments == other.arguments)
+-
+-    def __ne__(self, other):
+-        return not self.__eq__(other)
+-
+-
+-class Signature(object):
+-    '''A Signature object represents the overall signature of a function.
+-    It stores a Parameter object for each parameter accepted by the
+-    function, as well as information specific to the function itself.
+-
+-    A Signature object has the following public attributes and methods:
+-
+-    * parameters : OrderedDict
+-        An ordered mapping of parameters' names to the corresponding
+-        Parameter objects (keyword-only arguments are in the same order
+-        as listed in `code.co_varnames`).
+-    * return_annotation : object
+-        The annotation for the return type of the function if specified.
+-        If the function has no annotation for its return type, this
+-        attribute is not set.
+-    * bind(*args, **kwargs) -> BoundArguments
+-        Creates a mapping from positional and keyword arguments to
+-        parameters.
+-    * bind_partial(*args, **kwargs) -> BoundArguments
+-        Creates a partial mapping from positional and keyword arguments
+-        to parameters (simulating 'functools.partial' behavior.)
+-    '''
+-
+-    __slots__ = ('_return_annotation', '_parameters')
+-
+-    _parameter_cls = Parameter
+-    _bound_arguments_cls = BoundArguments
+-
+-    empty = _empty
+-
+-    def __init__(self, parameters=None, return_annotation=_empty,
+-                 __validate_parameters__=True):
+-        '''Constructs Signature from the given list of Parameter
+-        objects and 'return_annotation'.  All arguments are optional.
+-        '''
+-
+-        if parameters is None:
+-            params = OrderedDict()
+-        else:
+-            if __validate_parameters__:
+-                params = OrderedDict()
+-                top_kind = _POSITIONAL_ONLY
+-
+-                for idx, param in enumerate(parameters):
+-                    kind = param.kind
+-                    if kind < top_kind:
+-                        msg = 'wrong parameter order: {0} before {1}'
+-                        msg = msg.format(top_kind, param.kind)
+-                        raise ValueError(msg)
+-                    else:
+-                        top_kind = kind
+-
+-                    name = param.name
+-                    if name is None:
+-                        name = str(idx)
+-                        param = param.replace(name=name)
+-
+-                    if name in params:
+-                        msg = 'duplicate parameter name: {0!r}'.format(name)
+-                        raise ValueError(msg)
+-                    params[name] = param
+-            else:
+-                params = OrderedDict(((param.name, param)
+-                                                for param in parameters))
+-
+-        self._parameters = params
+-        self._return_annotation = return_annotation
+-
+-    @classmethod
+-    def from_function(cls, func):
+-        '''Constructs Signature for the given python function'''
+-
+-        if not isinstance(func, types.FunctionType):
+-            raise TypeError('{0!r} is not a Python function'.format(func))
+-
+-        Parameter = cls._parameter_cls
+-
+-        # Parameter information.
+-        func_code = func.__code__
+-        pos_count = func_code.co_argcount
+-        arg_names = func_code.co_varnames
+-        positional = tuple(arg_names[:pos_count])
+-        keyword_only_count = getattr(func_code, 'co_kwonlyargcount', 0)
+-        keyword_only = arg_names[pos_count:(pos_count + keyword_only_count)]
+-        annotations = getattr(func, '__annotations__', {})
+-        defaults = func.__defaults__
+-        kwdefaults = getattr(func, '__kwdefaults__', None)
+-
+-        if defaults:
+-            pos_default_count = len(defaults)
+-        else:
+-            pos_default_count = 0
+-
+-        parameters = []
+-
+-        # Non-keyword-only parameters w/o defaults.
+-        non_default_count = pos_count - pos_default_count
+-        for name in positional[:non_default_count]:
+-            annotation = annotations.get(name, _empty)
+-            parameters.append(Parameter(name, annotation=annotation,
+-                                        kind=_POSITIONAL_OR_KEYWORD))
+-
+-        # ... w/ defaults.
+-        for offset, name in enumerate(positional[non_default_count:]):
+-            annotation = annotations.get(name, _empty)
+-            parameters.append(Parameter(name, annotation=annotation,
+-                                        kind=_POSITIONAL_OR_KEYWORD,
+-                                        default=defaults[offset]))
+-
+-        # *args
+-        if func_code.co_flags & 0x04:
+-            name = arg_names[pos_count + keyword_only_count]
+-            annotation = annotations.get(name, _empty)
+-            parameters.append(Parameter(name, annotation=annotation,
+-                                        kind=_VAR_POSITIONAL))
+-
+-        # Keyword-only parameters.
+-        for name in keyword_only:
+-            default = _empty
+-            if kwdefaults is not None:
+-                default = kwdefaults.get(name, _empty)
+-
+-            annotation = annotations.get(name, _empty)
+-            parameters.append(Parameter(name, annotation=annotation,
+-                                        kind=_KEYWORD_ONLY,
+-                                        default=default))
+-        # **kwargs
+-        if func_code.co_flags & 0x08:
+-            index = pos_count + keyword_only_count
+-            if func_code.co_flags & 0x04:
+-                index += 1
+-
+-            name = arg_names[index]
+-            annotation = annotations.get(name, _empty)
+-            parameters.append(Parameter(name, annotation=annotation,
+-                                        kind=_VAR_KEYWORD))
+-
+-        return cls(parameters,
+-                   return_annotation=annotations.get('return', _empty),
+-                   __validate_parameters__=False)
+-
+-    @property
+-    def parameters(self):
+-        try:
+-            return types.MappingProxyType(self._parameters)
+-        except AttributeError:
+-            return OrderedDict(self._parameters.items())
+-
+-    @property
+-    def return_annotation(self):
+-        return self._return_annotation
+-
+-    def replace(self, parameters=_void, return_annotation=_void):
+-        '''Creates a customized copy of the Signature.
+-        Pass 'parameters' and/or 'return_annotation' arguments
+-        to override them in the new copy.
+-        '''
+-
+-        if parameters is _void:
+-            parameters = self.parameters.values()
+-
+-        if return_annotation is _void:
+-            return_annotation = self._return_annotation
+-
+-        return type(self)(parameters,
+-                          return_annotation=return_annotation)
+-
+-    def __hash__(self):
+-        msg = "unhashable type: '{0}'".format(self.__class__.__name__)
+-        raise TypeError(msg)
+-
+-    def __eq__(self, other):
+-        if (not issubclass(type(other), Signature) or
+-                    self.return_annotation != other.return_annotation or
+-                    len(self.parameters) != len(other.parameters)):
+-            return False
+-
+-        other_positions = dict((param, idx)
+-                           for idx, param in enumerate(other.parameters.keys()))
+-
+-        for idx, (param_name, param) in enumerate(self.parameters.items()):
+-            if param.kind == _KEYWORD_ONLY:
+-                try:
+-                    other_param = other.parameters[param_name]
+-                except KeyError:
+-                    return False
+-                else:
+-                    if param != other_param:
+-                        return False
+-            else:
+-                try:
+-                    other_idx = other_positions[param_name]
+-                except KeyError:
+-                    return False
+-                else:
+-                    if (idx != other_idx or
+-                                    param != other.parameters[param_name]):
+-                        return False
+-
+-        return True
+-
+-    def __ne__(self, other):
+-        return not self.__eq__(other)
+-
+-    def _bind(self, args, kwargs, partial=False):
+-        '''Private method.  Don't use directly.'''
+-
+-        arguments = OrderedDict()
+-
+-        parameters = iter(self.parameters.values())
+-        parameters_ex = ()
+-        arg_vals = iter(args)
+-
+-        if partial:
+-            # Support for binding arguments to 'functools.partial' objects.
+-            # See 'functools.partial' case in 'signature()' implementation
+-            # for details.
+-            for param_name, param in self.parameters.items():
+-                if (param._partial_kwarg and param_name not in kwargs):
+-                    # Simulating 'functools.partial' behavior
+-                    kwargs[param_name] = param.default
+-
+-        while True:
+-            # Let's iterate through the positional arguments and corresponding
+-            # parameters
+-            try:
+-                arg_val = next(arg_vals)
+-            except StopIteration:
+-                # No more positional arguments
+-                try:
+-                    param = next(parameters)
+-                except StopIteration:
+-                    # No more parameters. That's it. Just need to check that
+-                    # we have no `kwargs` after this while loop
+-                    break
+-                else:
+-                    if param.kind == _VAR_POSITIONAL:
+-                        # That's OK, just empty *args.  Let's start parsing
+-                        # kwargs
+-                        break
+-                    elif param.name in kwargs:
+-                        if param.kind == _POSITIONAL_ONLY:
+-                            msg = '{arg!r} parameter is positional only, ' \
+-                                  'but was passed as a keyword'
+-                            msg = msg.format(arg=param.name)
+-                            raise TypeError(msg)
+-                        parameters_ex = (param,)
+-                        break
+-                    elif (param.kind == _VAR_KEYWORD or
+-                                                param.default is not _empty):
+-                        # That's fine too - we have a default value for this
+-                        # parameter.  So, lets start parsing `kwargs`, starting
+-                        # with the current parameter
+-                        parameters_ex = (param,)
+-                        break
+-                    else:
+-                        if partial:
+-                            parameters_ex = (param,)
+-                            break
+-                        else:
+-                            msg = '{arg!r} parameter lacking default value'
+-                            msg = msg.format(arg=param.name)
+-                            raise TypeError(msg)
+-            else:
+-                # We have a positional argument to process
+-                try:
+-                    param = next(parameters)
+-                except StopIteration:
+-                    raise TypeError('too many positional arguments')
+-                else:
+-                    if param.kind in (_VAR_KEYWORD, _KEYWORD_ONLY):
+-                        # Looks like we have no parameter for this positional
+-                        # argument
+-                        raise TypeError('too many positional arguments')
+-
+-                    if param.kind == _VAR_POSITIONAL:
+-                        # We have an '*args'-like argument, let's fill it with
+-                        # all positional arguments we have left and move on to
+-                        # the next phase
+-                        values = [arg_val]
+-                        values.extend(arg_vals)
+-                        arguments[param.name] = tuple(values)
+-                        break
+-
+-                    if param.name in kwargs:
+-                        raise TypeError('multiple values for argument '
+-                                        '{arg!r}'.format(arg=param.name))
+-
+-                    arguments[param.name] = arg_val
+-
+-        # Now, we iterate through the remaining parameters to process
+-        # keyword arguments
+-        kwargs_param = None
+-        for param in itertools.chain(parameters_ex, parameters):
+-            if param.kind == _POSITIONAL_ONLY:
+-                # This should never happen in case of a properly built
+-                # Signature object (but let's have this check here
+-                # to ensure correct behaviour just in case)
+-                raise TypeError('{arg!r} parameter is positional only, '
+-                                'but was passed as a keyword'. \
+-                                format(arg=param.name))
+-
+-            if param.kind == _VAR_KEYWORD:
+-                # Memorize that we have a '**kwargs'-like parameter
+-                kwargs_param = param
+-                continue
+-
+-            param_name = param.name
+-            try:
+-                arg_val = kwargs.pop(param_name)
+-            except KeyError:
+-                # We have no value for this parameter.  It's fine though,
+-                # if it has a default value, or it is an '*args'-like
+-                # parameter, left alone by the processing of positional
+-                # arguments.
+-                if (not partial and param.kind != _VAR_POSITIONAL and
+-                                                    param.default is _empty):
+-                    raise TypeError('{arg!r} parameter lacking default value'. \
+-                                    format(arg=param_name))
+-
+-            else:
+-                arguments[param_name] = arg_val
+-
+-        if kwargs:
+-            if kwargs_param is not None:
+-                # Process our '**kwargs'-like parameter
+-                arguments[kwargs_param.name] = kwargs
+-            else:
+-                raise TypeError('too many keyword arguments')
+-
+-        return self._bound_arguments_cls(self, arguments)
+-
+-    def bind(self, *args, **kwargs):
+-        '''Get a BoundArguments object, that maps the passed `args`
+-        and `kwargs` to the function's signature.  Raises `TypeError`
+-        if the passed arguments can not be bound.
+-        '''
+-        return self._bind(args, kwargs)
+-
+-    def bind_partial(self, *args, **kwargs):
+-        '''Get a BoundArguments object, that partially maps the
+-        passed `args` and `kwargs` to the function's signature.
+-        Raises `TypeError` if the passed arguments can not be bound.
+-        '''
+-        return self._bind(args, kwargs, partial=True)
+-
+-    def __str__(self):
+-        result = []
+-        render_kw_only_separator = True
+-        for idx, param in enumerate(self.parameters.values()):
+-            formatted = str(param)
+-
+-            kind = param.kind
+-            if kind == _VAR_POSITIONAL:
+-                # OK, we have an '*args'-like parameter, so we won't need
+-                # a '*' to separate keyword-only arguments
+-                render_kw_only_separator = False
+-            elif kind == _KEYWORD_ONLY and render_kw_only_separator:
+-                # We have a keyword-only parameter to render and we haven't
+-                # rendered an '*args'-like parameter before, so add a '*'
+-                # separator to the parameters list ("foo(arg1, *, arg2)" case)
+-                result.append('*')
+-                # This condition should be only triggered once, so
+-                # reset the flag
+-                render_kw_only_separator = False
+-
+-            result.append(formatted)
+-
+-        rendered = '({0})'.format(', '.join(result))
+-
+-        if self.return_annotation is not _empty:
+-            anno = formatannotation(self.return_annotation)
+-            rendered += ' -> {0}'.format(anno)
++This file has been patched-away by the Debian package as compared to the
++upstream version, not to ship a copy of a the 'funcsigs' module that is now
++integrated into the upstream python3.3 release.
++"""
+ 
+-        return rendered
++from inspect import BoundArguments, Parameter, Signature, signature
+--- a/plainbox/vendor/funcsigs/version.py
++++ /dev/null
+@@ -1 +0,0 @@
+-__version__ = "0.3"
+--- a/plainbox/vendor/mock.py
++++ b/plainbox/vendor/mock.py
+@@ -1,2367 +1,29 @@
+-# mock.py
+-# Test tools for mocking and patching.
+-# Copyright (C) 2007-2012 Michael Foord & the mock team
+-# E-mail: fuzzyman AT voidspace DOT org DOT uk
++# This file is part of Checkbox.
++#
++# Copyright 2013 Canonical Ltd.
++# Written by:
++#   Zygmunt Krynicki <[e-mail]>
++#
++# Checkbox is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# Checkbox is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
++
++"""
++:mod:`plainbox.vendor.mock` -- vendorized mock module
++=====================================================
++
++This file has been patched-away by the Debian package as compared to the
++upstream version, not to ship a copy of a the 'mock' module that is now
++integrated into the upstream python3.3 release.
++"""
+ 
+-# mock 1.0
+-# http://www.voidspace.org.uk/python/mock/
+-
+-# Released subject to the BSD License
+-# Please see http://www.voidspace.org.uk/python/license.shtml
+-
+-# Scripts maintained at http://www.voidspace.org.uk/python/index.shtml
+-# Comments, suggestions and bug reports welcome.
+-
+-
+-__all__ = (
+-    'Mock',
+-    'MagicMock',
+-    'patch',
+-    'sentinel',
+-    'DEFAULT',
+-    'ANY',
+-    'call',
+-    'create_autospec',
+-    'FILTER_DIR',
+-    'NonCallableMock',
+-    'NonCallableMagicMock',
+-    'mock_open',
+-    'PropertyMock',
+-)
+-
+-
+-__version__ = '1.0.1'
+-
+-
+-import pprint
+-import sys
+-
+-try:
+-    import inspect
+-except ImportError:
+-    # for alternative platforms that
+-    # may not have inspect
+-    inspect = None
+-
+-try:
+-    from functools import wraps as original_wraps
+-except ImportError:
+-    # Python 2.4 compatibility
+-    def wraps(original):
+-        def inner(f):
+-            f.__name__ = original.__name__
+-            f.__doc__ = original.__doc__
+-            f.__module__ = original.__module__
+-            f.__wrapped__ = original
+-            return f
+-        return inner
+-else:
+-    if sys.version_info[:2] >= (3, 3):
+-        wraps = original_wraps
+-    else:
+-        def wraps(func):
+-            def inner(f):
+-                f = original_wraps(func)(f)
+-                f.__wrapped__ = func
+-                return f
+-            return inner
+-
+-try:
+-    unicode
+-except NameError:
+-    # Python 3
+-    basestring = unicode = str
+-
+-try:
+-    long
+-except NameError:
+-    # Python 3
+-    long = int
+-
+-try:
+-    BaseException
+-except NameError:
+-    # Python 2.4 compatibility
+-    BaseException = Exception
+-
+-try:
+-    next
+-except NameError:
+-    def next(obj):
+-        return obj.next()
+-
+-
+-BaseExceptions = (BaseException,)
+-if 'java' in sys.platform:
+-    # jython
+-    import java
+-    BaseExceptions = (BaseException, java.lang.Throwable)
+-
+-try:
+-    _isidentifier = str.isidentifier
+-except AttributeError:
+-    # Python 2.X
+-    import keyword
+-    import re
+-    regex = re.compile(r'^[a-z_][a-z0-9_]*$', re.I)
+-    def _isidentifier(string):
+-        if string in keyword.kwlist:
+-            return False
+-        return regex.match(string)
+-
+-
+-inPy3k = sys.version_info[0] == 3
+-
+-# Needed to work around Python 3 bug where use of "super" interferes with
+-# defining __class__ as a descriptor
+-_super = super
+-
+-self = 'im_self'
+-builtin = '__builtin__'
+-if inPy3k:
+-    self = '__self__'
+-    builtin = 'builtins'
+-
+-FILTER_DIR = True
+-
+-
+-def _is_instance_mock(obj):
+-    # can't use isinstance on Mock objects because they override __class__
+-    # The base class for all mocks is NonCallableMock
+-    return issubclass(type(obj), NonCallableMock)
+-
+-
+-def _is_exception(obj):
+-    return (
+-        isinstance(obj, BaseExceptions) or
+-        isinstance(obj, ClassTypes) and issubclass(obj, BaseExceptions)
+-    )
+-
+-
+-class _slotted(object):
+-    __slots__ = ['a']
+-
+-
+-DescriptorTypes = (
+-    type(_slotted.a),
+-    property,
+-)
+-
+-
+-def _getsignature(func, skipfirst, instance=False):
+-    if inspect is None:
+-        raise ImportError('inspect module not available')
+-
+-    if isinstance(func, ClassTypes) and not instance:
+-        try:
+-            func = func.__init__
+-        except AttributeError:
+-            return
+-        skipfirst = True
+-    elif not isinstance(func, FunctionTypes):
+-        # for classes where instance is True we end up here too
+-        try:
+-            func = func.__call__
+-        except AttributeError:
+-            return
+-
+-    if inPy3k:
+-        try:
+-            argspec = inspect.getfullargspec(func)
+-        except TypeError:
+-            # C function / method, possibly inherited object().__init__
+-            return
+-        regargs, varargs, varkw, defaults, kwonly, kwonlydef, ann = argspec
+-    else:
+-        try:
+-            regargs, varargs, varkwargs, defaults = inspect.getargspec(func)
+-        except TypeError:
+-            # C function / method, possibly inherited object().__init__
+-            return
+-
+-    # instance methods and classmethods need to lose the self argument
+-    if getattr(func, self, None) is not None:
+-        regargs = regargs[1:]
+-    if skipfirst:
+-        # this condition and the above one are never both True - why?
+-        regargs = regargs[1:]
+-
+-    if inPy3k:
+-        signature = inspect.formatargspec(
+-            regargs, varargs, varkw, defaults,
+-            kwonly, kwonlydef, ann, formatvalue=lambda value: "")
+-    else:
+-        signature = inspect.formatargspec(
+-            regargs, varargs, varkwargs, defaults,
+-            formatvalue=lambda value: "")
+-    return signature[1:-1], func
+-
+-
+-def _check_signature(func, mock, skipfirst, instance=False):
+-    if not _callable(func):
+-        return
+-
+-    result = _getsignature(func, skipfirst, instance)
+-    if result is None:
+-        return
+-    signature, func = result
+-
+-    # can't use self because "self" is common as an argument name
+-    # unfortunately even not in the first place
+-    src = "lambda _mock_self, %s: None" % signature
+-    checksig = eval(src, {})
+-    _copy_func_details(func, checksig)
+-    type(mock)._mock_check_sig = checksig
+-
+-
+-def _copy_func_details(func, funcopy):
+-    funcopy.__name__ = func.__name__
+-    funcopy.__doc__ = func.__doc__
+-    #funcopy.__dict__.update(func.__dict__)
+-    funcopy.__module__ = func.__module__
+-    if not inPy3k:
+-        funcopy.func_defaults = func.func_defaults
+-        return
+-    funcopy.__defaults__ = func.__defaults__
+-    funcopy.__kwdefaults__ = func.__kwdefaults__
+-
+-
+-def _callable(obj):
+-    if isinstance(obj, ClassTypes):
+-        return True
+-    if getattr(obj, '__call__', None) is not None:
+-        return True
+-    return False
+-
+-
+-def _is_list(obj):
+-    # checks for list or tuples
+-    # XXXX badly named!
+-    return type(obj) in (list, tuple)
+-
+-
+-def _instance_callable(obj):
+-    """Given an object, return True if the object is callable.
+-    For classes, return True if instances would be callable."""
+-    if not isinstance(obj, ClassTypes):
+-        # already an instance
+-        return getattr(obj, '__call__', None) is not None
+-
+-    klass = obj
+-    # uses __bases__ instead of __mro__ so that we work with old style classes
+-    if klass.__dict__.get('__call__') is not None:
+-        return True
+-
+-    for base in klass.__bases__:
+-        if _instance_callable(base):
+-            return True
+-    return False
+-
+-
+-def _set_signature(mock, original, instance=False):
+-    # creates a function with signature (*args, **kwargs) that delegates to a
+-    # mock. It still does signature checking by calling a lambda with the same
+-    # signature as the original.
+-    if not _callable(original):
+-        return
+-
+-    skipfirst = isinstance(original, ClassTypes)
+-    result = _getsignature(original, skipfirst, instance)
+-    if result is None:
+-        # was a C function (e.g. object().__init__ ) that can't be mocked
+-        return
+-
+-    signature, func = result
+-
+-    src = "lambda %s: None" % signature
+-    checksig = eval(src, {})
+-    _copy_func_details(func, checksig)
+-
+-    name = original.__name__
+-    if not _isidentifier(name):
+-        name = 'funcopy'
+-    context = {'_checksig_': checksig, 'mock': mock}
+-    src = """def %s(*args, **kwargs):
+-    _checksig_(*args, **kwargs)
+-    return mock(*args, **kwargs)""" % name
+-    exec (src, context)
+-    funcopy = context[name]
+-    _setup_func(funcopy, mock)
+-    return funcopy
+-
+-
+-def _setup_func(funcopy, mock):
+-    funcopy.mock = mock
+-
+-    # can't use isinstance with mocks
+-    if not _is_instance_mock(mock):
+-        return
+-
+-    def assert_called_with(*args, **kwargs):
+-        return mock.assert_called_with(*args, **kwargs)
+-    def assert_called_once_with(*args, **kwargs):
+-        return mock.assert_called_once_with(*args, **kwargs)
+-    def assert_has_calls(*args, **kwargs):
+-        return mock.assert_has_calls(*args, **kwargs)
+-    def assert_any_call(*args, **kwargs):
+-        return mock.assert_any_call(*args, **kwargs)
+-    def reset_mock():
+-        funcopy.method_calls = _CallList()
+-        funcopy.mock_calls = _CallList()
+-        mock.reset_mock()
+-        ret = funcopy.return_value
+-        if _is_instance_mock(ret) and not ret is mock:
+-            ret.reset_mock()
+-
+-    funcopy.called = False
+-    funcopy.call_count = 0
+-    funcopy.call_args = None
+-    funcopy.call_args_list = _CallList()
+-    funcopy.method_calls = _CallList()
+-    funcopy.mock_calls = _CallList()
+-
+-    funcopy.return_value = mock.return_value
+-    funcopy.side_effect = mock.side_effect
+-    funcopy._mock_children = mock._mock_children
+-
+-    funcopy.assert_called_with = assert_called_with
+-    funcopy.assert_called_once_with = assert_called_once_with
+-    funcopy.assert_has_calls = assert_has_calls
+-    funcopy.assert_any_call = assert_any_call
+-    funcopy.reset_mock = reset_mock
+-
+-    mock._mock_delegate = funcopy
+-
+-
+-def _is_magic(name):
+-    return '__%s__' % name[2:-2] == name
+-
+-
+-class _SentinelObject(object):
+-    "A unique, named, sentinel object."
+-    def __init__(self, name):
+-        self.name = name
+-
+-    def __repr__(self):
+-        return 'sentinel.%s' % self.name
+-
+-
+-class _Sentinel(object):
+-    """Access attributes to return a named object, usable as a sentinel."""
+-    def __init__(self):
+-        self._sentinels = {}
+-
+-    def __getattr__(self, name):
+-        if name == '__bases__':
+-            # Without this help(mock) raises an exception
+-            raise AttributeError
+-        return self._sentinels.setdefault(name, _SentinelObject(name))
+-
+-
+-sentinel = _Sentinel()
+-
+-DEFAULT = sentinel.DEFAULT
+-_missing = sentinel.MISSING
+-_deleted = sentinel.DELETED
+-
+-
+-class OldStyleClass:
+-    pass
+-ClassType = type(OldStyleClass)
+-
+-
+-def _copy(value):
+-    if type(value) in (dict, list, tuple, set):
+-        return type(value)(value)
+-    return value
+-
+-
+-ClassTypes = (type,)
+-if not inPy3k:
+-    ClassTypes = (type, ClassType)
+-
+-_allowed_names = set(
+-    [
+-        'return_value', '_mock_return_value', 'side_effect',
+-        '_mock_side_effect', '_mock_parent', '_mock_new_parent',
+-        '_mock_name', '_mock_new_name'
+-    ]
+-)
+-
+-
+-def _delegating_property(name):
+-    _allowed_names.add(name)
+-    _the_name = '_mock_' + name
+-    def _get(self, name=name, _the_name=_the_name):
+-        sig = self._mock_delegate
+-        if sig is None:
+-            return getattr(self, _the_name)
+-        return getattr(sig, name)
+-    def _set(self, value, name=name, _the_name=_the_name):
+-        sig = self._mock_delegate
+-        if sig is None:
+-            self.__dict__[_the_name] = value
+-        else:
+-            setattr(sig, name, value)
+-
+-    return property(_get, _set)
+-
+-
+-
+-class _CallList(list):
+-
+-    def __contains__(self, value):
+-        if not isinstance(value, list):
+-            return list.__contains__(self, value)
+-        len_value = len(value)
+-        len_self = len(self)
+-        if len_value > len_self:
+-            return False
+-
+-        for i in range(0, len_self - len_value + 1):
+-            sub_list = self[i:i+len_value]
+-            if sub_list == value:
+-                return True
+-        return False
+-
+-    def __repr__(self):
+-        return pprint.pformat(list(self))
+-
+-
+-def _check_and_set_parent(parent, value, name, new_name):
+-    if not _is_instance_mock(value):
+-        return False
+-    if ((value._mock_name or value._mock_new_name) or
+-        (value._mock_parent is not None) or
+-        (value._mock_new_parent is not None)):
+-        return False
+-
+-    _parent = parent
+-    while _parent is not None:
+-        # setting a mock (value) as a child or return value of itself
+-        # should not modify the mock
+-        if _parent is value:
+-            return False
+-        _parent = _parent._mock_new_parent
+-
+-    if new_name:
+-        value._mock_new_parent = parent
+-        value._mock_new_name = new_name
+-    if name:
+-        value._mock_parent = parent
+-        value._mock_name = name
+-    return True
+-
+-
+-
+-class Base(object):
+-    _mock_return_value = DEFAULT
+-    _mock_side_effect = None
+-    def __init__(self, *args, **kwargs):
+-        pass
+-
+-
+-
+-class NonCallableMock(Base):
+-    """A non-callable version of `Mock`"""
+-
+-    def __new__(cls, *args, **kw):
+-        # every instance has its own class
+-        # so we can create magic methods on the
+-        # class without stomping on other mocks
+-        new = type(cls.__name__, (cls,), {'__doc__': cls.__doc__})
+-        instance = object.__new__(new)
+-        return instance
+-
+-
+-    def __init__(
+-            self, spec=None, wraps=None, name=None, spec_set=None,
+-            parent=None, _spec_state=None, _new_name='', _new_parent=None,
+-            **kwargs
+-        ):
+-        if _new_parent is None:
+-            _new_parent = parent
+-
+-        __dict__ = self.__dict__
+-        __dict__['_mock_parent'] = parent
+-        __dict__['_mock_name'] = name
+-        __dict__['_mock_new_name'] = _new_name
+-        __dict__['_mock_new_parent'] = _new_parent
+-
+-        if spec_set is not None:
+-            spec = spec_set
+-            spec_set = True
+-
+-        self._mock_add_spec(spec, spec_set)
+-
+-        __dict__['_mock_children'] = {}
+-        __dict__['_mock_wraps'] = wraps
+-        __dict__['_mock_delegate'] = None
+-
+-        __dict__['_mock_called'] = False
+-        __dict__['_mock_call_args'] = None
+-        __dict__['_mock_call_count'] = 0
+-        __dict__['_mock_call_args_list'] = _CallList()
+-        __dict__['_mock_mock_calls'] = _CallList()
+-
+-        __dict__['method_calls'] = _CallList()
+-
+-        if kwargs:
+-            self.configure_mock(**kwargs)
+-
+-        _super(NonCallableMock, self).__init__(
+-            spec, wraps, name, spec_set, parent,
+-            _spec_state
+-        )
+-
+-
+-    def attach_mock(self, mock, attribute):
+-        """
+-        Attach a mock as an attribute of this one, replacing its name and
+-        parent. Calls to the attached mock will be recorded in the
+-        `method_calls` and `mock_calls` attributes of this one."""
+-        mock._mock_parent = None
+-        mock._mock_new_parent = None
+-        mock._mock_name = ''
+-        mock._mock_new_name = None
+-
+-        setattr(self, attribute, mock)
+-
+-
+-    def mock_add_spec(self, spec, spec_set=False):
+-        """Add a spec to a mock. `spec` can either be an object or a
+-        list of strings. Only attributes on the `spec` can be fetched as
+-        attributes from the mock.
+-
+-        If `spec_set` is True then only attributes on the spec can be set."""
+-        self._mock_add_spec(spec, spec_set)
+-
+-
+-    def _mock_add_spec(self, spec, spec_set):
+-        _spec_class = None
+-
+-        if spec is not None and not _is_list(spec):
+-            if isinstance(spec, ClassTypes):
+-                _spec_class = spec
+-            else:
+-                _spec_class = _get_class(spec)
+-
+-            spec = dir(spec)
+-
+-        __dict__ = self.__dict__
+-        __dict__['_spec_class'] = _spec_class
+-        __dict__['_spec_set'] = spec_set
+-        __dict__['_mock_methods'] = spec
+-
+-
+-    def __get_return_value(self):
+-        ret = self._mock_return_value
+-        if self._mock_delegate is not None:
+-            ret = self._mock_delegate.return_value
+-
+-        if ret is DEFAULT:
+-            ret = self._get_child_mock(
+-                _new_parent=self, _new_name='()'
+-            )
+-            self.return_value = ret
+-        return ret
+-
+-
+-    def __set_return_value(self, value):
+-        if self._mock_delegate is not None:
+-            self._mock_delegate.return_value = value
+-        else:
+-            self._mock_return_value = value
+-            _check_and_set_parent(self, value, None, '()')
+-
+-    __return_value_doc = "The value to be returned when the mock is called."
+-    return_value = property(__get_return_value, __set_return_value,
+-                            __return_value_doc)
+-
+-
+-    @property
+-    def __class__(self):
+-        if self._spec_class is None:
+-            return type(self)
+-        return self._spec_class
+-
+-    called = _delegating_property('called')
+-    call_count = _delegating_property('call_count')
+-    call_args = _delegating_property('call_args')
+-    call_args_list = _delegating_property('call_args_list')
+-    mock_calls = _delegating_property('mock_calls')
+-
+-
+-    def __get_side_effect(self):
+-        sig = self._mock_delegate
+-        if sig is None:
+-            return self._mock_side_effect
+-        return sig.side_effect
+-
+-    def __set_side_effect(self, value):
+-        value = _try_iter(value)
+-        sig = self._mock_delegate
+-        if sig is None:
+-            self._mock_side_effect = value
+-        else:
+-            sig.side_effect = value
+-
+-    side_effect = property(__get_side_effect, __set_side_effect)
+-
+-
+-    def reset_mock(self):
+-        "Restore the mock object to its initial state."
+-        self.called = False
+-        self.call_args = None
+-        self.call_count = 0
+-        self.mock_calls = _CallList()
+-        self.call_args_list = _CallList()
+-        self.method_calls = _CallList()
+-
+-        for child in self._mock_children.values():
+-            if isinstance(child, _SpecState):
+-                continue
+-            child.reset_mock()
+-
+-        ret = self._mock_return_value
+-        if _is_instance_mock(ret) and ret is not self:
+-            ret.reset_mock()
+-
+-
+-    def configure_mock(self, **kwargs):
+-        """Set attributes on the mock through keyword arguments.
+-
+-        Attributes plus return values and side effects can be set on child
+-        mocks using standard dot notation and unpacking a dictionary in the
+-        method call:
+-
+-        >>> attrs = {'method.return_value': 3, 'other.side_effect': KeyError}
+-        >>> mock.configure_mock(**attrs)"""
+-        for arg, val in sorted(kwargs.items(),
+-                               # we sort on the number of dots so that
+-                               # attributes are set before we set attributes on
+-                               # attributes
+-                               key=lambda entry: entry[0].count('.')):
+-            args = arg.split('.')
+-            final = args.pop()
+-            obj = self
+-            for entry in args:
+-                obj = getattr(obj, entry)
+-            setattr(obj, final, val)
+-
+-
+-    def __getattr__(self, name):
+-        if name == '_mock_methods':
+-            raise AttributeError(name)
+-        elif self._mock_methods is not None:
+-            if name not in self._mock_methods or name in _all_magics:
+-                raise AttributeError("Mock object has no attribute %r" % name)
+-        elif _is_magic(name):
+-            raise AttributeError(name)
+-
+-        result = self._mock_children.get(name)
+-        if result is _deleted:
+-            raise AttributeError(name)
+-        elif result is None:
+-            wraps = None
+-            if self._mock_wraps is not None:
+-                # XXXX should we get the attribute without triggering code
+-                # execution?
+-                wraps = getattr(self._mock_wraps, name)
+-
+-            result = self._get_child_mock(
+-                parent=self, name=name, wraps=wraps, _new_name=name,
+-                _new_parent=self
+-            )
+-            self._mock_children[name]  = result
+-
+-        elif isinstance(result, _SpecState):
+-            result = create_autospec(
+-                result.spec, result.spec_set, result.instance,
+-                result.parent, result.name
+-            )
+-            self._mock_children[name]  = result
+-
+-        return result
+-
+-
+-    def __repr__(self):
+-        _name_list = [self._mock_new_name]
+-        _parent = self._mock_new_parent
+-        last = self
+-
+-        dot = '.'
+-        if _name_list == ['()']:
+-            dot = ''
+-        seen = set()
+-        while _parent is not None:
+-            last = _parent
+-
+-            _name_list.append(_parent._mock_new_name + dot)
+-            dot = '.'
+-            if _parent._mock_new_name == '()':
+-                dot = ''
+-
+-            _parent = _parent._mock_new_parent
+-
+-            # use ids here so as not to call __hash__ on the mocks
+-            if id(_parent) in seen:
+-                break
+-            seen.add(id(_parent))
+-
+-        _name_list = list(reversed(_name_list))
+-        _first = last._mock_name or 'mock'
+-        if len(_name_list) > 1:
+-            if _name_list[1] not in ('()', '().'):
+-                _first += '.'
+-        _name_list[0] = _first
+-        name = ''.join(_name_list)
+-
+-        name_string = ''
+-        if name not in ('mock', 'mock.'):
+-            name_string = ' name=%r' % name
+-
+-        spec_string = ''
+-        if self._spec_class is not None:
+-            spec_string = ' spec=%r'
+-            if self._spec_set:
+-                spec_string = ' spec_set=%r'
+-            spec_string = spec_string % self._spec_class.__name__
+-        return "<%s%s%s id='%s'>" % (
+-            type(self).__name__,
+-            name_string,
+-            spec_string,
+-            id(self)
+-        )
+-
+-
+-    def __dir__(self):
+-        """Filter the output of `dir(mock)` to only useful members.
+-        XXXX
+-        """
+-        extras = self._mock_methods or []
+-        from_type = dir(type(self))
+-        from_dict = list(self.__dict__)
+-
+-        if FILTER_DIR:
+-            from_type = [e for e in from_type if not e.startswith('_')]
+-            from_dict = [e for e in from_dict if not e.startswith('_') or
+-                         _is_magic(e)]
+-        return sorted(set(extras + from_type + from_dict +
+-                          list(self._mock_children)))
+-
+-
+-    def __setattr__(self, name, value):
+-        if name in _allowed_names:
+-            # property setters go through here
+-            return object.__setattr__(self, name, value)
+-        elif (self._spec_set and self._mock_methods is not None and
+-            name not in self._mock_methods and
+-            name not in self.__dict__):
+-            raise AttributeError("Mock object has no attribute '%s'" % name)
+-        elif name in _unsupported_magics:
+-            msg = 'Attempting to set unsupported magic method %r.' % name
+-            raise AttributeError(msg)
+-        elif name in _all_magics:
+-            if self._mock_methods is not None and name not in self._mock_methods:
+-                raise AttributeError("Mock object has no attribute '%s'" % name)
+-
+-            if not _is_instance_mock(value):
+-                setattr(type(self), name, _get_method(name, value))
+-                original = value
+-                value = lambda *args, **kw: original(self, *args, **kw)
+-            else:
+-                # only set _new_name and not name so that mock_calls is tracked
+-                # but not method calls
+-                _check_and_set_parent(self, value, None, name)
+-                setattr(type(self), name, value)
+-                self._mock_children[name] = value
+-        elif name == '__class__':
+-            self._spec_class = value
+-            return
+-        else:
+-            if _check_and_set_parent(self, value, name, name):
+-                self._mock_children[name] = value
+-        return object.__setattr__(self, name, value)
+-
+-
+-    def __delattr__(self, name):
+-        if name in _all_magics and name in type(self).__dict__:
+-            delattr(type(self), name)
+-            if name not in self.__dict__:
+-                # for magic methods that are still MagicProxy objects and
+-                # not set on the instance itself
+-                return
+-
+-        if name in self.__dict__:
+-            object.__delattr__(self, name)
+-
+-        obj = self._mock_children.get(name, _missing)
+-        if obj is _deleted:
+-            raise AttributeError(name)
+-        if obj is not _missing:
+-            del self._mock_children[name]
+-        self._mock_children[name] = _deleted
+-
+-
+-
+-    def _format_mock_call_signature(self, args, kwargs):
+-        name = self._mock_name or 'mock'
+-        return _format_call_signature(name, args, kwargs)
+-
+-
+-    def _format_mock_failure_message(self, args, kwargs):
+-        message = 'Expected call: %s\nActual call: %s'
+-        expected_string = self._format_mock_call_signature(args, kwargs)
+-        call_args = self.call_args
+-        if len(call_args) == 3:
+-            call_args = call_args[1:]
+-        actual_string = self._format_mock_call_signature(*call_args)
+-        return message % (expected_string, actual_string)
+-
+-
+-    def assert_called_with(_mock_self, *args, **kwargs):
+-        """assert that the mock was called with the specified arguments.
+-
+-        Raises an AssertionError if the args and keyword args passed in are
+-        different to the last call to the mock."""
+-        self = _mock_self
+-        if self.call_args is None:
+-            expected = self._format_mock_call_signature(args, kwargs)
+-            raise AssertionError('Expected call: %s\nNot called' % (expected,))
+-
+-        if self.call_args != (args, kwargs):
+-            msg = self._format_mock_failure_message(args, kwargs)
+-            raise AssertionError(msg)
+-
+-
+-    def assert_called_once_with(_mock_self, *args, **kwargs):
+-        """assert that the mock was called exactly once and with the specified
+-        arguments."""
+-        self = _mock_self
+-        if not self.call_count == 1:
+-            msg = ("Expected to be called once. Called %s times." %
+-                   self.call_count)
+-            raise AssertionError(msg)
+-        return self.assert_called_with(*args, **kwargs)
+-
+-
+-    def assert_has_calls(self, calls, any_order=False):
+-        """assert the mock has been called with the specified calls.
+-        The `mock_calls` list is checked for the calls.
+-
+-        If `any_order` is False (the default) then the calls must be
+-        sequential. There can be extra calls before or after the
+-        specified calls.
+-
+-        If `any_order` is True then the calls can be in any order, but
+-        they must all appear in `mock_calls`."""
+-        if not any_order:
+-            if calls not in self.mock_calls:
+-                raise AssertionError(
+-                    'Calls not found.\nExpected: %r\n'
+-                    'Actual: %r' % (calls, self.mock_calls)
+-                )
+-            return
+-
+-        all_calls = list(self.mock_calls)
+-
+-        not_found = []
+-        for kall in calls:
+-            try:
+-                all_calls.remove(kall)
+-            except ValueError:
+-                not_found.append(kall)
+-        if not_found:
+-            raise AssertionError(
+-                '%r not all found in call list' % (tuple(not_found),)
+-            )
+-
+-
+-    def assert_any_call(self, *args, **kwargs):
+-        """assert the mock has been called with the specified arguments.
+-
+-        The assert passes if the mock has *ever* been called, unlike
+-        `assert_called_with` and `assert_called_once_with` that only pass if
+-        the call is the most recent one."""
+-        kall = call(*args, **kwargs)
+-        if kall not in self.call_args_list:
+-            expected_string = self._format_mock_call_signature(args, kwargs)
+-            raise AssertionError(
+-                '%s call not found' % expected_string
+-            )
+-
+-
+-    def _get_child_mock(self, **kw):
+-        """Create the child mocks for attributes and return value.
+-        By default child mocks will be the same type as the parent.
+-        Subclasses of Mock may want to override this to customize the way
+-        child mocks are made.
+-
+-        For non-callable mocks the callable variant will be used (rather than
+-        any custom subclass)."""
+-        _type = type(self)
+-        if not issubclass(_type, CallableMixin):
+-            if issubclass(_type, NonCallableMagicMock):
+-                klass = MagicMock
+-            elif issubclass(_type, NonCallableMock) :
+-                klass = Mock
+-        else:
+-            klass = _type.__mro__[1]
+-        return klass(**kw)
+-
+-
+-
+-def _try_iter(obj):
+-    if obj is None:
+-        return obj
+-    if _is_exception(obj):
+-        return obj
+-    if _callable(obj):
+-        return obj
+-    try:
+-        return iter(obj)
+-    except TypeError:
+-        # XXXX backwards compatibility
+-        # but this will blow up on first call - so maybe we should fail early?
+-        return obj
+-
+-
+-
+-class CallableMixin(Base):
+-
+-    def __init__(self, spec=None, side_effect=None, return_value=DEFAULT,
+-                 wraps=None, name=None, spec_set=None, parent=None,
+-                 _spec_state=None, _new_name='', _new_parent=None, **kwargs):
+-        self.__dict__['_mock_return_value'] = return_value
+-
+-        _super(CallableMixin, self).__init__(
+-            spec, wraps, name, spec_set, parent,
+-            _spec_state, _new_name, _new_parent, **kwargs
+-        )
+-
+-        self.side_effect = side_effect
+-
+-
+-    def _mock_check_sig(self, *args, **kwargs):
+-        # stub method that can be replaced with one with a specific signature
+-        pass
+-
+-
+-    def __call__(_mock_self, *args, **kwargs):
+-        # can't use self in-case a function / method we are mocking uses self
+-        # in the signature
+-        _mock_self._mock_check_sig(*args, **kwargs)
+-        return _mock_self._mock_call(*args, **kwargs)
+-
+-
+-    def _mock_call(_mock_self, *args, **kwargs):
+-        self = _mock_self
+-        self.called = True
+-        self.call_count += 1
+-        self.call_args = _Call((args, kwargs), two=True)
+-        self.call_args_list.append(_Call((args, kwargs), two=True))
+-
+-        _new_name = self._mock_new_name
+-        _new_parent = self._mock_new_parent
+-        self.mock_calls.append(_Call(('', args, kwargs)))
+-
+-        seen = set()
+-        skip_next_dot = _new_name == '()'
+-        do_method_calls = self._mock_parent is not None
+-        name = self._mock_name
+-        while _new_parent is not None:
+-            this_mock_call = _Call((_new_name, args, kwargs))
+-            if _new_parent._mock_new_name:
+-                dot = '.'
+-                if skip_next_dot:
+-                    dot = ''
+-
+-                skip_next_dot = False
+-                if _new_parent._mock_new_name == '()':
+-                    skip_next_dot = True
+-
+-                _new_name = _new_parent._mock_new_name + dot + _new_name
+-
+-            if do_method_calls:
+-                if _new_name == name:
+-                    this_method_call = this_mock_call
+-                else:
+-                    this_method_call = _Call((name, args, kwargs))
+-                _new_parent.method_calls.append(this_method_call)
+-
+-                do_method_calls = _new_parent._mock_parent is not None
+-                if do_method_calls:
+-                    name = _new_parent._mock_name + '.' + name
+-
+-            _new_parent.mock_calls.append(this_mock_call)
+-            _new_parent = _new_parent._mock_new_parent
+-
+-            # use ids here so as not to call __hash__ on the mocks
+-            _new_parent_id = id(_new_parent)
+-            if _new_parent_id in seen:
+-                break
+-            seen.add(_new_parent_id)
+-
+-        ret_val = DEFAULT
+-        effect = self.side_effect
+-        if effect is not None:
+-            if _is_exception(effect):
+-                raise effect
+-
+-            if not _callable(effect):
+-                result = next(effect)
+-                if _is_exception(result):
+-                    raise result
+-                return result
+-
+-            ret_val = effect(*args, **kwargs)
+-            if ret_val is DEFAULT:
+-                ret_val = self.return_value
+-
+-        if (self._mock_wraps is not None and
+-             self._mock_return_value is DEFAULT):
+-            return self._mock_wraps(*args, **kwargs)
+-        if ret_val is DEFAULT:
+-            ret_val = self.return_value
+-        return ret_val
+-
+-
+-
+-class Mock(CallableMixin, NonCallableMock):
+-    """
+-    Create a new `Mock` object. `Mock` takes several optional arguments
+-    that specify the behaviour of the Mock object:
+-
+-    * `spec`: This can be either a list of strings or an existing object (a
+-      class or instance) that acts as the specification for the mock object. If
+-      you pass in an object then a list of strings is formed by calling dir on
+-      the object (excluding unsupported magic attributes and methods). Accessing
+-      any attribute not in this list will raise an `AttributeError`.
+-
+-      If `spec` is an object (rather than a list of strings) then
+-      `mock.__class__` returns the class of the spec object. This allows mocks
+-      to pass `isinstance` tests.
+-
+-    * `spec_set`: A stricter variant of `spec`. If used, attempting to *set*
+-      or get an attribute on the mock that isn't on the object passed as
+-      `spec_set` will raise an `AttributeError`.
+-
+-    * `side_effect`: A function to be called whenever the Mock is called. See
+-      the `side_effect` attribute. Useful for raising exceptions or
+-      dynamically changing return values. The function is called with the same
+-      arguments as the mock, and unless it returns `DEFAULT`, the return
+-      value of this function is used as the return value.
+-
+-      Alternatively `side_effect` can be an exception class or instance. In
+-      this case the exception will be raised when the mock is called.
+-
+-      If `side_effect` is an iterable then each call to the mock will return
+-      the next value from the iterable. If any of the members of the iterable
+-      are exceptions they will be raised instead of returned.
+-
+-    * `return_value`: The value returned when the mock is called. By default
+-      this is a new Mock (created on first access). See the
+-      `return_value` attribute.
+-
+-    * `wraps`: Item for the mock object to wrap. If `wraps` is not None then
+-      calling the Mock will pass the call through to the wrapped object
+-      (returning the real result). Attribute access on the mock will return a
+-      Mock object that wraps the corresponding attribute of the wrapped object
+-      (so attempting to access an attribute that doesn't exist will raise an
+-      `AttributeError`).
+-
+-      If the mock has an explicit `return_value` set then calls are not passed
+-      to the wrapped object and the `return_value` is returned instead.
+-
+-    * `name`: If the mock has a name then it will be used in the repr of the
+-      mock. This can be useful for debugging. The name is propagated to child
+-      mocks.
+-
+-    Mocks can also be called with arbitrary keyword arguments. These will be
+-    used to set attributes on the mock after it is created.
+-    """
+-
+-
+-
+-def _dot_lookup(thing, comp, import_path):
+-    try:
+-        return getattr(thing, comp)
+-    except AttributeError:
+-        __import__(import_path)
+-        return getattr(thing, comp)
+-
+-
+-def _importer(target):
+-    components = target.split('.')
+-    import_path = components.pop(0)
+-    thing = __import__(import_path)
+-
+-    for comp in components:
+-        import_path += ".%s" % comp
+-        thing = _dot_lookup(thing, comp, import_path)
+-    return thing
+-
+-
+-def _is_started(patcher):
+-    # XXXX horrible
+-    return hasattr(patcher, 'is_local')
+-
+-
+-class _patch(object):
+-
+-    attribute_name = None
+-    _active_patches = set()
+-
+-    def __init__(
+-            self, getter, attribute, new, spec, create,
+-            spec_set, autospec, new_callable, kwargs
+-        ):
+-        if new_callable is not None:
+-            if new is not DEFAULT:
+-                raise ValueError(
+-                    "Cannot use 'new' and 'new_callable' together"
+-                )
+-            if autospec is not None:
+-                raise ValueError(
+-                    "Cannot use 'autospec' and 'new_callable' together"
+-                )
+-
+-        self.getter = getter
+-        self.attribute = attribute
+-        self.new = new
+-        self.new_callable = new_callable
+-        self.spec = spec
+-        self.create = create
+-        self.has_local = False
+-        self.spec_set = spec_set
+-        self.autospec = autospec
+-        self.kwargs = kwargs
+-        self.additional_patchers = []
+-
+-
+-    def copy(self):
+-        patcher = _patch(
+-            self.getter, self.attribute, self.new, self.spec,
+-            self.create, self.spec_set,
+-            self.autospec, self.new_callable, self.kwargs
+-        )
+-        patcher.attribute_name = self.attribute_name
+-        patcher.additional_patchers = [
+-            p.copy() for p in self.additional_patchers
+-        ]
+-        return patcher
+-
+-
+-    def __call__(self, func):
+-        if isinstance(func, ClassTypes):
+-            return self.decorate_class(func)
+-        return self.decorate_callable(func)
+-
+-
+-    def decorate_class(self, klass):
+-        for attr in dir(klass):
+-            if not attr.startswith(patch.TEST_PREFIX):
+-                continue
+-
+-            attr_value = getattr(klass, attr)
+-            if not hasattr(attr_value, "__call__"):
+-                continue
+-
+-            patcher = self.copy()
+-            setattr(klass, attr, patcher(attr_value))
+-        return klass
+-
+-
+-    def decorate_callable(self, func):
+-        if hasattr(func, 'patchings'):
+-            func.patchings.append(self)
+-            return func
+-
+-        @wraps(func)
+-        def patched(*args, **keywargs):
+-            # don't use a with here (backwards compatability with Python 2.4)
+-            extra_args = []
+-            entered_patchers = []
+-
+-            # can't use try...except...finally because of Python 2.4
+-            # compatibility
+-            exc_info = tuple()
+-            try:
+-                try:
+-                    for patching in patched.patchings:
+-                        arg = patching.__enter__()
+-                        entered_patchers.append(patching)
+-                        if patching.attribute_name is not None:
+-                            keywargs.update(arg)
+-                        elif patching.new is DEFAULT:
+-                            extra_args.append(arg)
+-
+-                    args += tuple(extra_args)
+-                    return func(*args, **keywargs)
+-                except:
+-                    if (patching not in entered_patchers and
+-                        _is_started(patching)):
+-                        # the patcher may have been started, but an exception
+-                        # raised whilst entering one of its additional_patchers
+-                        entered_patchers.append(patching)
+-                    # Pass the exception to __exit__
+-                    exc_info = sys.exc_info()
+-                    # re-raise the exception
+-                    raise
+-            finally:
+-                for patching in reversed(entered_patchers):
+-                    patching.__exit__(*exc_info)
+-
+-        patched.patchings = [self]
+-        if hasattr(func, 'func_code'):
+-            # not in Python 3
+-            patched.compat_co_firstlineno = getattr(
+-                func, "compat_co_firstlineno",
+-                func.func_code.co_firstlineno
+-            )
+-        return patched
+-
+-
+-    def get_original(self):
+-        target = self.getter()
+-        name = self.attribute
+-
+-        original = DEFAULT
+-        local = False
+-
+-        try:
+-            original = target.__dict__[name]
+-        except (AttributeError, KeyError):
+-            original = getattr(target, name, DEFAULT)
+-        else:
+-            local = True
+-
+-        if not self.create and original is DEFAULT:
+-            raise AttributeError(
+-                "%s does not have the attribute %r" % (target, name)
+-            )
+-        return original, local
+-
+-
+-    def __enter__(self):
+-        """Perform the patch."""
+-        new, spec, spec_set = self.new, self.spec, self.spec_set
+-        autospec, kwargs = self.autospec, self.kwargs
+-        new_callable = self.new_callable
+-        self.target = self.getter()
+-
+-        # normalise False to None
+-        if spec is False:
+-            spec = None
+-        if spec_set is False:
+-            spec_set = None
+-        if autospec is False:
+-            autospec = None
+-
+-        if spec is not None and autospec is not None:
+-            raise TypeError("Can't specify spec and autospec")
+-        if ((spec is not None or autospec is not None) and
+-            spec_set not in (True, None)):
+-            raise TypeError("Can't provide explicit spec_set *and* spec or autospec")
+-
+-        original, local = self.get_original()
+-
+-        if new is DEFAULT and autospec is None:
+-            inherit = False
+-            if spec is True:
+-                # set spec to the object we are replacing
+-                spec = original
+-                if spec_set is True:
+-                    spec_set = original
+-                    spec = None
+-            elif spec is not None:
+-                if spec_set is True:
+-                    spec_set = spec
+-                    spec = None
+-            elif spec_set is True:
+-                spec_set = original
+-
+-            if spec is not None or spec_set is not None:
+-                if original is DEFAULT:
+-                    raise TypeError("Can't use 'spec' with create=True")
+-                if isinstance(original, ClassTypes):
+-                    # If we're patching out a class and there is a spec
+-                    inherit = True
+-
+-            Klass = MagicMock
+-            _kwargs = {}
+-            if new_callable is not None:
+-                Klass = new_callable
+-            elif spec is not None or spec_set is not None:
+-                this_spec = spec
+-                if spec_set is not None:
+-                    this_spec = spec_set
+-                if _is_list(this_spec):
+-                    not_callable = '__call__' not in this_spec
+-                else:
+-                    not_callable = not _callable(this_spec)
+-                if not_callable:
+-                    Klass = NonCallableMagicMock
+-
+-            if spec is not None:
+-                _kwargs['spec'] = spec
+-            if spec_set is not None:
+-                _kwargs['spec_set'] = spec_set
+-
+-            # add a name to mocks
+-            if (isinstance(Klass, type) and
+-                issubclass(Klass, NonCallableMock) and self.attribute):
+-                _kwargs['name'] = self.attribute
+-
+-            _kwargs.update(kwargs)
+-            new = Klass(**_kwargs)
+-
+-            if inherit and _is_instance_mock(new):
+-                # we can only tell if the instance should be callable if the
+-                # spec is not a list
+-                this_spec = spec
+-                if spec_set is not None:
+-                    this_spec = spec_set
+-                if (not _is_list(this_spec) and not
+-                    _instance_callable(this_spec)):
+-                    Klass = NonCallableMagicMock
+-
+-                _kwargs.pop('name')
+-                new.return_value = Klass(_new_parent=new, _new_name='()',
+-                                         **_kwargs)
+-        elif autospec is not None:
+-            # spec is ignored, new *must* be default, spec_set is treated
+-            # as a boolean. Should we check spec is not None and that spec_set
+-            # is a bool?
+-            if new is not DEFAULT:
+-                raise TypeError(
+-                    "autospec creates the mock for you. Can't specify "
+-                    "autospec and new."
+-                )
+-            if original is DEFAULT:
+-                raise TypeError("Can't use 'autospec' with create=True")
+-            spec_set = bool(spec_set)
+-            if autospec is True:
+-                autospec = original
+-
+-            new = create_autospec(autospec, spec_set=spec_set,
+-                                  _name=self.attribute, **kwargs)
+-        elif kwargs:
+-            # can't set keyword args when we aren't creating the mock
+-            # XXXX If new is a Mock we could call new.configure_mock(**kwargs)
+-            raise TypeError("Can't pass kwargs to a mock we aren't creating")
+-
+-        new_attr = new
+-
+-        self.temp_original = original
+-        self.is_local = local
+-        setattr(self.target, self.attribute, new_attr)
+-        if self.attribute_name is not None:
+-            extra_args = {}
+-            if self.new is DEFAULT:
+-                extra_args[self.attribute_name] =  new
+-            for patching in self.additional_patchers:
+-                arg = patching.__enter__()
+-                if patching.new is DEFAULT:
+-                    extra_args.update(arg)
+-            return extra_args
+-
+-        return new
+-
+-
+-    def __exit__(self, *exc_info):
+-        """Undo the patch."""
+-        if not _is_started(self):
+-            raise RuntimeError('stop called on unstarted patcher')
+-
+-        if self.is_local and self.temp_original is not DEFAULT:
+-            setattr(self.target, self.attribute, self.temp_original)
+-        else:
+-            delattr(self.target, self.attribute)
+-            if not self.create and not hasattr(self.target, self.attribute):
+-                # needed for proxy objects like django settings
+-                setattr(self.target, self.attribute, self.temp_original)
+-
+-        del self.temp_original
+-        del self.is_local
+-        del self.target
+-        for patcher in reversed(self.additional_patchers):
+-            if _is_started(patcher):
+-                patcher.__exit__(*exc_info)
+-
+-
+-    def start(self):
+-        """Activate a patch, returning any created mock."""
+-        result = self.__enter__()
+-        self._active_patches.add(self)
+-        return result
+-
+-
+-    def stop(self):
+-        """Stop an active patch."""
+-        self._active_patches.discard(self)
+-        return self.__exit__()
+-
+-
+-
+-def _get_target(target):
+-    try:
+-        target, attribute = target.rsplit('.', 1)
+-    except (TypeError, ValueError):
+-        raise TypeError("Need a valid target to patch. You supplied: %r" %
+-                        (target,))
+-    getter = lambda: _importer(target)
+-    return getter, attribute
+-
+-
+-def _patch_object(
+-        target, attribute, new=DEFAULT, spec=None,
+-        create=False, spec_set=None, autospec=None,
+-        new_callable=None, **kwargs
+-    ):
+-    """
+-    patch.object(target, attribute, new=DEFAULT, spec=None, create=False,
+-                 spec_set=None, autospec=None, new_callable=None, **kwargs)
+-
+-    patch the named member (`attribute`) on an object (`target`) with a mock
+-    object.
+-
+-    `patch.object` can be used as a decorator, class decorator or a context
+-    manager. Arguments `new`, `spec`, `create`, `spec_set`,
+-    `autospec` and `new_callable` have the same meaning as for `patch`. Like
+-    `patch`, `patch.object` takes arbitrary keyword arguments for configuring
+-    the mock object it creates.
+-
+-    When used as a class decorator `patch.object` honours `patch.TEST_PREFIX`
+-    for choosing which methods to wrap.
+-    """
+-    getter = lambda: target
+-    return _patch(
+-        getter, attribute, new, spec, create,
+-        spec_set, autospec, new_callable, kwargs
+-    )
+-
+-
+-def _patch_multiple(target, spec=None, create=False, spec_set=None,
+-                    autospec=None, new_callable=None, **kwargs):
+-    """Perform multiple patches in a single call. It takes the object to be
+-    patched (either as an object or a string to fetch the object by importing)
+-    and keyword arguments for the patches::
+-
+-        with patch.multiple(settings, FIRST_PATCH='one', SECOND_PATCH='two'):
+-            ...
+-
+-    Use `DEFAULT` as the value if you want `patch.multiple` to create
+-    mocks for you. In this case the created mocks are passed into a decorated
+-    function by keyword, and a dictionary is returned when `patch.multiple` is
+-    used as a context manager.
+-
+-    `patch.multiple` can be used as a decorator, class decorator or a context
+-    manager. The arguments `spec`, `spec_set`, `create`,
+-    `autospec` and `new_callable` have the same meaning as for `patch`. These
+-    arguments will be applied to *all* patches done by `patch.multiple`.
+-
+-    When used as a class decorator `patch.multiple` honours `patch.TEST_PREFIX`
+-    for choosing which methods to wrap.
+-    """
+-    if type(target) in (unicode, str):
+-        getter = lambda: _importer(target)
+-    else:
+-        getter = lambda: target
+-
+-    if not kwargs:
+-        raise ValueError(
+-            'Must supply at least one keyword argument with patch.multiple'
+-        )
+-    # need to wrap in a list for python 3, where items is a view
+-    items = list(kwargs.items())
+-    attribute, new = items[0]
+-    patcher = _patch(
+-        getter, attribute, new, spec, create, spec_set,
+-        autospec, new_callable, {}
+-    )
+-    patcher.attribute_name = attribute
+-    for attribute, new in items[1:]:
+-        this_patcher = _patch(
+-            getter, attribute, new, spec, create, spec_set,
+-            autospec, new_callable, {}
+-        )
+-        this_patcher.attribute_name = attribute
+-        patcher.additional_patchers.append(this_patcher)
+-    return patcher
+-
+-
+-def patch(
+-        target, new=DEFAULT, spec=None, create=False,
+-        spec_set=None, autospec=None, new_callable=None, **kwargs
+-    ):
+-    """
+-    `patch` acts as a function decorator, class decorator or a context
+-    manager. Inside the body of the function or with statement, the `target`
+-    is patched with a `new` object. When the function/with statement exits
+-    the patch is undone.
+-
+-    If `new` is omitted, then the target is replaced with a
+-    `MagicMock`. If `patch` is used as a decorator and `new` is
+-    omitted, the created mock is passed in as an extra argument to the
+-    decorated function. If `patch` is used as a context manager the created
+-    mock is returned by the context manager.
+-
+-    `target` should be a string in the form `'package.module.ClassName'`. The
+-    `target` is imported and the specified object replaced with the `new`
+-    object, so the `target` must be importable from the environment you are
+-    calling `patch` from. The target is imported when the decorated function
+-    is executed, not at decoration time.
+-
+-    The `spec` and `spec_set` keyword arguments are passed to the `MagicMock`
+-    if patch is creating one for you.
+-
+-    In addition you can pass `spec=True` or `spec_set=True`, which causes
+-    patch to pass in the object being mocked as the spec/spec_set object.
+-
+-    `new_callable` allows you to specify a different class, or callable object,
+-    that will be called to create the `new` object. By default `MagicMock` is
+-    used.
+-
+-    A more powerful form of `spec` is `autospec`. If you set `autospec=True`
+-    then the mock with be created with a spec from the object being replaced.
+-    All attributes of the mock will also have the spec of the corresponding
+-    attribute of the object being replaced. Methods and functions being
+-    mocked will have their arguments checked and will raise a `TypeError` if
+-    they are called with the wrong signature. For mocks replacing a class,
+-    their return value (the 'instance') will have the same spec as the class.
+-
+-    Instead of `autospec=True` you can pass `autospec=some_object` to use an
+-    arbitrary object as the spec instead of the one being replaced.
+-
+-    By default `patch` will fail to replace attributes that don't exist. If
+-    you pass in `create=True`, and the attribute doesn't exist, patch will
+-    create the attribute for you when the patched function is called, and
+-    delete it again afterwards. This is useful for writing tests against
+-    attributes that your production code creates at runtime. It is off by by
+-    default because it can be dangerous. With it switched on you can write
+-    passing tests against APIs that don't actually exist!
+-
+-    Patch can be used as a `TestCase` class decorator. It works by
+-    decorating each test method in the class. This reduces the boilerplate
+-    code when your test methods share a common patchings set. `patch` finds
+-    tests by looking for method names that start with `patch.TEST_PREFIX`.
+-    By default this is `test`, which matches the way `unittest` finds tests.
+-    You can specify an alternative prefix by setting `patch.TEST_PREFIX`.
+-
+-    Patch can be used as a context manager, with the with statement. Here the
+-    patching applies to the indented block after the with statement. If you
+-    use "as" then the patched object will be bound to the name after the
+-    "as"; very useful if `patch` is creating a mock object for you.
+-
+-    `patch` takes arbitrary keyword arguments. These will be passed to
+-    the `Mock` (or `new_callable`) on construction.
+-
+-    `patch.dict(...)`, `patch.multiple(...)` and `patch.object(...)` are
+-    available for alternate use-cases.
+-    """
+-    getter, attribute = _get_target(target)
+-    return _patch(
+-        getter, attribute, new, spec, create,
+-        spec_set, autospec, new_callable, kwargs
+-    )
+-
+-
+-class _patch_dict(object):
+-    """
+-    Patch a dictionary, or dictionary like object, and restore the dictionary
+-    to its original state after the test.
+-
+-    `in_dict` can be a dictionary or a mapping like container. If it is a
+-    mapping then it must at least support getting, setting and deleting items
+-    plus iterating over keys.
+-
+-    `in_dict` can also be a string specifying the name of the dictionary, which
+-    will then be fetched by importing it.
+-
+-    `values` can be a dictionary of values to set in the dictionary. `values`
+-    can also be an iterable of `(key, value)` pairs.
+-
+-    If `clear` is True then the dictionary will be cleared before the new
+-    values are set.
+-
+-    `patch.dict` can also be called with arbitrary keyword arguments to set
+-    values in the dictionary::
+-
+-        with patch.dict('sys.modules', mymodule=Mock(), other_module=Mock()):
+-            ...
+-
+-    `patch.dict` can be used as a context manager, decorator or class
+-    decorator. When used as a class decorator `patch.dict` honours
+-    `patch.TEST_PREFIX` for choosing which methods to wrap.
+-    """
+-
+-    def __init__(self, in_dict, values=(), clear=False, **kwargs):
+-        if isinstance(in_dict, basestring):
+-            in_dict = _importer(in_dict)
+-        self.in_dict = in_dict
+-        # support any argument supported by dict(...) constructor
+-        self.values = dict(values)
+-        self.values.update(kwargs)
+-        self.clear = clear
+-        self._original = None
+-
+-
+-    def __call__(self, f):
+-        if isinstance(f, ClassTypes):
+-            return self.decorate_class(f)
+-        @wraps(f)
+-        def _inner(*args, **kw):
+-            self._patch_dict()
+-            try:
+-                return f(*args, **kw)
+-            finally:
+-                self._unpatch_dict()
+-
+-        return _inner
+-
+-
+-    def decorate_class(self, klass):
+-        for attr in dir(klass):
+-            attr_value = getattr(klass, attr)
+-            if (attr.startswith(patch.TEST_PREFIX) and
+-                 hasattr(attr_value, "__call__")):
+-                decorator = _patch_dict(self.in_dict, self.values, self.clear)
+-                decorated = decorator(attr_value)
+-                setattr(klass, attr, decorated)
+-        return klass
+-
+-
+-    def __enter__(self):
+-        """Patch the dict."""
+-        self._patch_dict()
+-
+-
+-    def _patch_dict(self):
+-        values = self.values
+-        in_dict = self.in_dict
+-        clear = self.clear
+-
+-        try:
+-            original = in_dict.copy()
+-        except AttributeError:
+-            # dict like object with no copy method
+-            # must support iteration over keys
+-            original = {}
+-            for key in in_dict:
+-                original[key] = in_dict[key]
+-        self._original = original
+-
+-        if clear:
+-            _clear_dict(in_dict)
+-
+-        try:
+-            in_dict.update(values)
+-        except AttributeError:
+-            # dict like object with no update method
+-            for key in values:
+-                in_dict[key] = values[key]
+-
+-
+-    def _unpatch_dict(self):
+-        in_dict = self.in_dict
+-        original = self._original
+-
+-        _clear_dict(in_dict)
+-
+-        try:
+-            in_dict.update(original)
+-        except AttributeError:
+-            for key in original:
+-                in_dict[key] = original[key]
+-
+-
+-    def __exit__(self, *args):
+-        """Unpatch the dict."""
+-        self._unpatch_dict()
+-        return False
+-
+-    start = __enter__
+-    stop = __exit__
+-
+-
+-def _clear_dict(in_dict):
+-    try:
+-        in_dict.clear()
+-    except AttributeError:
+-        keys = list(in_dict)
+-        for key in keys:
+-            del in_dict[key]
+-
+-
+-def _patch_stopall():
+-    """Stop all active patches."""
+-    for patch in list(_patch._active_patches):
+-        patch.stop()
+-
+-
+-patch.object = _patch_object
+-patch.dict = _patch_dict
+-patch.multiple = _patch_multiple
+-patch.stopall = _patch_stopall
+-patch.TEST_PREFIX = 'test'
+-
+-magic_methods = (
+-    "lt le gt ge eq ne "
+-    "getitem setitem delitem "
+-    "len contains iter "
+-    "hash str sizeof "
+-    "enter exit "
+-    "divmod neg pos abs invert "
+-    "complex int float index "
+-    "trunc floor ceil "
+-)
+-
+-numerics = "add sub mul div floordiv mod lshift rshift and xor or pow "
+-inplace = ' '.join('i%s' % n for n in numerics.split())
+-right = ' '.join('r%s' % n for n in numerics.split())
+-extra = ''
+-if inPy3k:
+-    extra = 'bool next '
+-else:
+-    extra = 'unicode long nonzero oct hex truediv rtruediv '
+-
+-# not including __prepare__, __instancecheck__, __subclasscheck__
+-# (as they are metaclass methods)
+-# __del__ is not supported at all as it causes problems if it exists
+-
+-_non_defaults = set('__%s__' % method for method in [
+-    'cmp', 'getslice', 'setslice', 'coerce', 'subclasses',
+-    'format', 'get', 'set', 'delete', 'reversed',
+-    'missing', 'reduce', 'reduce_ex', 'getinitargs',
+-    'getnewargs', 'getstate', 'setstate', 'getformat',
+-    'setformat', 'repr', 'dir'
+-])
+-
+-
+-def _get_method(name, func):
+-    "Turns a callable object (like a mock) into a real function"
+-    def method(self, *args, **kw):
+-        return func(self, *args, **kw)
+-    method.__name__ = name
+-    return method
+-
+-
+-_magics = set(
+-    '__%s__' % method for method in
+-    ' '.join([magic_methods, numerics, inplace, right, extra]).split()
+-)
+-
+-_all_magics = _magics | _non_defaults
+-
+-_unsupported_magics = set([
+-    '__getattr__', '__setattr__',
+-    '__init__', '__new__', '__prepare__'
+-    '__instancecheck__', '__subclasscheck__',
+-    '__del__'
+-])
+-
+-_calculate_return_value = {
+-    '__hash__': lambda self: object.__hash__(self),
+-    '__str__': lambda self: object.__str__(self),
+-    '__sizeof__': lambda self: object.__sizeof__(self),
+-    '__unicode__': lambda self: unicode(object.__str__(self)),
+-}
+-
+-_return_values = {
+-    '__lt__': NotImplemented,
+-    '__gt__': NotImplemented,
+-    '__le__': NotImplemented,
+-    '__ge__': NotImplemented,
+-    '__int__': 1,
+-    '__contains__': False,
+-    '__len__': 0,
+-    '__exit__': False,
+-    '__complex__': 1j,
+-    '__float__': 1.0,
+-    '__bool__': True,
+-    '__nonzero__': True,
+-    '__oct__': '1',
+-    '__hex__': '0x1',
+-    '__long__': long(1),
+-    '__index__': 1,
+-}
+-
+-
+-def _get_eq(self):
+-    def __eq__(other):
+-        ret_val = self.__eq__._mock_return_value
+-        if ret_val is not DEFAULT:
+-            return ret_val
+-        return self is other
+-    return __eq__
+-
+-def _get_ne(self):
+-    def __ne__(other):
+-        if self.__ne__._mock_return_value is not DEFAULT:
+-            return DEFAULT
+-        return self is not other
+-    return __ne__
+-
+-def _get_iter(self):
+-    def __iter__():
+-        ret_val = self.__iter__._mock_return_value
+-        if ret_val is DEFAULT:
+-            return iter([])
+-        # if ret_val was already an iterator, then calling iter on it should
+-        # return the iterator unchanged
+-        return iter(ret_val)
+-    return __iter__
+-
+-_side_effect_methods = {
+-    '__eq__': _get_eq,
+-    '__ne__': _get_ne,
+-    '__iter__': _get_iter,
+-}
+-
+-
+-
+-def _set_return_value(mock, method, name):
+-    fixed = _return_values.get(name, DEFAULT)
+-    if fixed is not DEFAULT:
+-        method.return_value = fixed
+-        return
+-
+-    return_calulator = _calculate_return_value.get(name)
+-    if return_calulator is not None:
+-        try:
+-            return_value = return_calulator(mock)
+-        except AttributeError:
+-            # XXXX why do we return AttributeError here?
+-            #      set it as a side_effect instead?
+-            return_value = AttributeError(name)
+-        method.return_value = return_value
+-        return
+-
+-    side_effector = _side_effect_methods.get(name)
+-    if side_effector is not None:
+-        method.side_effect = side_effector(mock)
+-
+-
+-
+-class MagicMixin(object):
+-    def __init__(self, *args, **kw):
+-        _super(MagicMixin, self).__init__(*args, **kw)
+-        self._mock_set_magics()
+-
+-
+-    def _mock_set_magics(self):
+-        these_magics = _magics
+-
+-        if self._mock_methods is not None:
+-            these_magics = _magics.intersection(self._mock_methods)
+-
+-            remove_magics = set()
+-            remove_magics = _magics - these_magics
+-
+-            for entry in remove_magics:
+-                if entry in type(self).__dict__:
+-                    # remove unneeded magic methods
+-                    delattr(self, entry)
+-
+-        # don't overwrite existing attributes if called a second time
+-        these_magics = these_magics - set(type(self).__dict__)
+-
+-        _type = type(self)
+-        for entry in these_magics:
+-            setattr(_type, entry, MagicProxy(entry, self))
+-
+-
+-
+-class NonCallableMagicMock(MagicMixin, NonCallableMock):
+-    """A version of `MagicMock` that isn't callable."""
+-    def mock_add_spec(self, spec, spec_set=False):
+-        """Add a spec to a mock. `spec` can either be an object or a
+-        list of strings. Only attributes on the `spec` can be fetched as
+-        attributes from the mock.
+-
+-        If `spec_set` is True then only attributes on the spec can be set."""
+-        self._mock_add_spec(spec, spec_set)
+-        self._mock_set_magics()
+-
+-
+-
+-class MagicMock(MagicMixin, Mock):
+-    """
+-    MagicMock is a subclass of Mock with default implementations
+-    of most of the magic methods. You can use MagicMock without having to
+-    configure the magic methods yourself.
+-
+-    If you use the `spec` or `spec_set` arguments then *only* magic
+-    methods that exist in the spec will be created.
+-
+-    Attributes and the return value of a `MagicMock` will also be `MagicMocks`.
+-    """
+-    def mock_add_spec(self, spec, spec_set=False):
+-        """Add a spec to a mock. `spec` can either be an object or a
+-        list of strings. Only attributes on the `spec` can be fetched as
+-        attributes from the mock.
+-
+-        If `spec_set` is True then only attributes on the spec can be set."""
+-        self._mock_add_spec(spec, spec_set)
+-        self._mock_set_magics()
+-
+-
+-
+-class MagicProxy(object):
+-    def __init__(self, name, parent):
+-        self.name = name
+-        self.parent = parent
+-
+-    def __call__(self, *args, **kwargs):
+-        m = self.create_mock()
+-        return m(*args, **kwargs)
+-
+-    def create_mock(self):
+-        entry = self.name
+-        parent = self.parent
+-        m = parent._get_child_mock(name=entry, _new_name=entry,
+-                                   _new_parent=parent)
+-        setattr(parent, entry, m)
+-        _set_return_value(parent, m, entry)
+-        return m
+-
+-    def __get__(self, obj, _type=None):
+-        return self.create_mock()
+-
+-
+-
+-class _ANY(object):
+-    "A helper object that compares equal to everything."
+-
+-    def __eq__(self, other):
+-        return True
+-
+-    def __ne__(self, other):
+-        return False
+-
+-    def __repr__(self):
+-        return '<ANY>'
+-
+-ANY = _ANY()
+-
+-
+-
+-def _format_call_signature(name, args, kwargs):
+-    message = '%s(%%s)' % name
+-    formatted_args = ''
+-    args_string = ', '.join([repr(arg) for arg in args])
+-    kwargs_string = ', '.join([
+-        '%s=%r' % (key, value) for key, value in kwargs.items()
+-    ])
+-    if args_string:
+-        formatted_args = args_string
+-    if kwargs_string:
+-        if formatted_args:
+-            formatted_args += ', '
+-        formatted_args += kwargs_string
+-
+-    return message % formatted_args
+-
+-
+-
+-class _Call(tuple):
+-    """
+-    A tuple for holding the results of a call to a mock, either in the form
+-    `(args, kwargs)` or `(name, args, kwargs)`.
+-
+-    If args or kwargs are empty then a call tuple will compare equal to
+-    a tuple without those values. This makes comparisons less verbose::
+-
+-        _Call(('name', (), {})) == ('name',)
+-        _Call(('name', (1,), {})) == ('name', (1,))
+-        _Call(((), {'a': 'b'})) == ({'a': 'b'},)
+-
+-    The `_Call` object provides a useful shortcut for comparing with call::
+-
+-        _Call(((1, 2), {'a': 3})) == call(1, 2, a=3)
+-        _Call(('foo', (1, 2), {'a': 3})) == call.foo(1, 2, a=3)
+-
+-    If the _Call has no name then it will match any name.
+-    """
+-    def __new__(cls, value=(), name=None, parent=None, two=False,
+-                from_kall=True):
+-        name = ''
+-        args = ()
+-        kwargs = {}
+-        _len = len(value)
+-        if _len == 3:
+-            name, args, kwargs = value
+-        elif _len == 2:
+-            first, second = value
+-            if isinstance(first, basestring):
+-                name = first
+-                if isinstance(second, tuple):
+-                    args = second
+-                else:
+-                    kwargs = second
+-            else:
+-                args, kwargs = first, second
+-        elif _len == 1:
+-            value, = value
+-            if isinstance(value, basestring):
+-                name = value
+-            elif isinstance(value, tuple):
+-                args = value
+-            else:
+-                kwargs = value
+-
+-        if two:
+-            return tuple.__new__(cls, (args, kwargs))
+-
+-        return tuple.__new__(cls, (name, args, kwargs))
+-
+-
+-    def __init__(self, value=(), name=None, parent=None, two=False,
+-                 from_kall=True):
+-        self.name = name
+-        self.parent = parent
+-        self.from_kall = from_kall
+-
+-
+-    def __eq__(self, other):
+-        if other is ANY:
+-            return True
+-        try:
+-            len_other = len(other)
+-        except TypeError:
+-            return False
+-
+-        self_name = ''
+-        if len(self) == 2:
+-            self_args, self_kwargs = self
+-        else:
+-            self_name, self_args, self_kwargs = self
+-
+-        other_name = ''
+-        if len_other == 0:
+-            other_args, other_kwargs = (), {}
+-        elif len_other == 3:
+-            other_name, other_args, other_kwargs = other
+-        elif len_other == 1:
+-            value, = other
+-            if isinstance(value, tuple):
+-                other_args = value
+-                other_kwargs = {}
+-            elif isinstance(value, basestring):
+-                other_name = value
+-                other_args, other_kwargs = (), {}
+-            else:
+-                other_args = ()
+-                other_kwargs = value
+-        else:
+-            # len 2
+-            # could be (name, args) or (name, kwargs) or (args, kwargs)
+-            first, second = other
+-            if isinstance(first, basestring):
+-                other_name = first
+-                if isinstance(second, tuple):
+-                    other_args, other_kwargs = second, {}
+-                else:
+-                    other_args, other_kwargs = (), second
+-            else:
+-                other_args, other_kwargs = first, second
+-
+-        if self_name and other_name != self_name:
+-            return False
+-
+-        # this order is important for ANY to work!
+-        return (other_args, other_kwargs) == (self_args, self_kwargs)
+-
+-
+-    def __ne__(self, other):
+-        return not self.__eq__(other)
+-
+-
+-    def __call__(self, *args, **kwargs):
+-        if self.name is None:
+-            return _Call(('', args, kwargs), name='()')
+-
+-        name = self.name + '()'
+-        return _Call((self.name, args, kwargs), name=name, parent=self)
+-
+-
+-    def __getattr__(self, attr):
+-        if self.name is None:
+-            return _Call(name=attr, from_kall=False)
+-        name = '%s.%s' % (self.name, attr)
+-        return _Call(name=name, parent=self, from_kall=False)
+-
+-
+-    def __repr__(self):
+-        if not self.from_kall:
+-            name = self.name or 'call'
+-            if name.startswith('()'):
+-                name = 'call%s' % name
+-            return name
+-
+-        if len(self) == 2:
+-            name = 'call'
+-            args, kwargs = self
+-        else:
+-            name, args, kwargs = self
+-            if not name:
+-                name = 'call'
+-            elif not name.startswith('()'):
+-                name = 'call.%s' % name
+-            else:
+-                name = 'call%s' % name
+-        return _format_call_signature(name, args, kwargs)
+-
+-
+-    def call_list(self):
+-        """For a call object that represents multiple calls, `call_list`
+-        returns a list of all the intermediate calls as well as the
+-        final call."""
+-        vals = []
+-        thing = self
+-        while thing is not None:
+-            if thing.from_kall:
+-                vals.append(thing)
+-            thing = thing.parent
+-        return _CallList(reversed(vals))
+-
+-
+-call = _Call(from_kall=False)
+-
+-
+-
+-def create_autospec(spec, spec_set=False, instance=False, _parent=None,
+-                    _name=None, **kwargs):
+-    """Create a mock object using another object as a spec. Attributes on the
+-    mock will use the corresponding attribute on the `spec` object as their
+-    spec.
+-
+-    Functions or methods being mocked will have their arguments checked
+-    to check that they are called with the correct signature.
+-
+-    If `spec_set` is True then attempting to set attributes that don't exist
+-    on the spec object will raise an `AttributeError`.
+-
+-    If a class is used as a spec then the return value of the mock (the
+-    instance of the class) will have the same spec. You can use a class as the
+-    spec for an instance object by passing `instance=True`. The returned mock
+-    will only be callable if instances of the mock are callable.
+-
+-    `create_autospec` also takes arbitrary keyword arguments that are passed to
+-    the constructor of the created mock."""
+-    if _is_list(spec):
+-        # can't pass a list instance to the mock constructor as it will be
+-        # interpreted as a list of strings
+-        spec = type(spec)
+-
+-    is_type = isinstance(spec, ClassTypes)
+-
+-    _kwargs = {'spec': spec}
+-    if spec_set:
+-        _kwargs = {'spec_set': spec}
+-    elif spec is None:
+-        # None we mock with a normal mock without a spec
+-        _kwargs = {}
+-
+-    _kwargs.update(kwargs)
+-
+-    Klass = MagicMock
+-    if type(spec) in DescriptorTypes:
+-        # descriptors don't have a spec
+-        # because we don't know what type they return
+-        _kwargs = {}
+-    elif not _callable(spec):
+-        Klass = NonCallableMagicMock
+-    elif is_type and instance and not _instance_callable(spec):
+-        Klass = NonCallableMagicMock
+-
+-    _new_name = _name
+-    if _parent is None:
+-        # for a top level object no _new_name should be set
+-        _new_name = ''
+-
+-    mock = Klass(parent=_parent, _new_parent=_parent, _new_name=_new_name,
+-                 name=_name, **_kwargs)
+-
+-    if isinstance(spec, FunctionTypes):
+-        # should only happen at the top level because we don't
+-        # recurse for functions
+-        mock = _set_signature(mock, spec)
+-    else:
+-        _check_signature(spec, mock, is_type, instance)
+-
+-    if _parent is not None and not instance:
+-        _parent._mock_children[_name] = mock
+-
+-    if is_type and not instance and 'return_value' not in kwargs:
+-        mock.return_value = create_autospec(spec, spec_set, instance=True,
+-                                            _name='()', _parent=mock)
+-
+-    for entry in dir(spec):
+-        if _is_magic(entry):
+-            # MagicMock already does the useful magic methods for us
+-            continue
+-
+-        if isinstance(spec, FunctionTypes) and entry in FunctionAttributes:
+-            # allow a mock to actually be a function
+-            continue
+-
+-        # XXXX do we need a better way of getting attributes without
+-        # triggering code execution (?) Probably not - we need the actual
+-        # object to mock it so we would rather trigger a property than mock
+-        # the property descriptor. Likewise we want to mock out dynamically
+-        # provided attributes.
+-        # XXXX what about attributes that raise exceptions other than
+-        # AttributeError on being fetched?
+-        # we could be resilient against it, or catch and propagate the
+-        # exception when the attribute is fetched from the mock
+-        try:
+-            original = getattr(spec, entry)
+-        except AttributeError:
+-            continue
+-
+-        kwargs = {'spec': original}
+-        if spec_set:
+-            kwargs = {'spec_set': original}
+-
+-        if not isinstance(original, FunctionTypes):
+-            new = _SpecState(original, spec_set, mock, entry, instance)
+-            mock._mock_children[entry] = new
+-        else:
+-            parent = mock
+-            if isinstance(spec, FunctionTypes):
+-                parent = mock.mock
+-
+-            new = MagicMock(parent=parent, name=entry, _new_name=entry,
+-                            _new_parent=parent, **kwargs)
+-            mock._mock_children[entry] = new
+-            skipfirst = _must_skip(spec, entry, is_type)
+-            _check_signature(original, new, skipfirst=skipfirst)
+-
+-        # so functions created with _set_signature become instance attributes,
+-        # *plus* their underlying mock exists in _mock_children of the parent
+-        # mock. Adding to _mock_children may be unnecessary where we are also
+-        # setting as an instance attribute?
+-        if isinstance(new, FunctionTypes):
+-            setattr(mock, entry, new)
+-
+-    return mock
+-
+-
+-def _must_skip(spec, entry, is_type):
+-    if not isinstance(spec, ClassTypes):
+-        if entry in getattr(spec, '__dict__', {}):
+-            # instance attribute - shouldn't skip
+-            return False
+-        spec = spec.__class__
+-    if not hasattr(spec, '__mro__'):
+-        # old style class: can't have descriptors anyway
+-        return is_type
+-
+-    for klass in spec.__mro__:
+-        result = klass.__dict__.get(entry, DEFAULT)
+-        if result is DEFAULT:
+-            continue
+-        if isinstance(result, (staticmethod, classmethod)):
+-            return False
+-        return is_type
+-
+-    # shouldn't get here unless function is a dynamically provided attribute
+-    # XXXX untested behaviour
+-    return is_type
+-
+-
+-def _get_class(obj):
+-    try:
+-        return obj.__class__
+-    except AttributeError:
+-        # in Python 2, _sre.SRE_Pattern objects have no __class__
+-        return type(obj)
+-
+-
+-class _SpecState(object):
+-
+-    def __init__(self, spec, spec_set=False, parent=None,
+-                 name=None, ids=None, instance=False):
+-        self.spec = spec
+-        self.ids = ids
+-        self.spec_set = spec_set
+-        self.parent = parent
+-        self.instance = instance
+-        self.name = name
+-
+-
+-FunctionTypes = (
+-    # python function
+-    type(create_autospec),
+-    # instance method
+-    type(ANY.__eq__),
+-    # unbound method
+-    type(_ANY.__eq__),
+-)
+-
+-FunctionAttributes = set([
+-    'func_closure',
+-    'func_code',
+-    'func_defaults',
+-    'func_dict',
+-    'func_doc',
+-    'func_globals',
+-    'func_name',
+-])
+-
+-
+-file_spec = None
+-
+-
+-def mock_open(mock=None, read_data=''):
+-    """
+-    A helper function to create a mock to replace the use of `open`. It works
+-    for `open` called directly or used as a context manager.
+-
+-    The `mock` argument is the mock object to configure. If `None` (the
+-    default) then a `MagicMock` will be created for you, with the API limited
+-    to methods or attributes available on standard file handles.
+-
+-    `read_data` is a string for the `read` method of the file handle to return.
+-    This is an empty string by default.
+-    """
+-    global file_spec
+-    if file_spec is None:
+-        # set on first use
+-        if inPy3k:
+-            import _io
+-            file_spec = list(set(dir(_io.TextIOWrapper)).union(set(dir(_io.BytesIO))))
+-        else:
+-            file_spec = file
+-
+-    if mock is None:
+-        mock = MagicMock(name='open', spec=open)
+-
+-    handle = MagicMock(spec=file_spec)
+-    handle.write.return_value = None
+-    handle.__enter__.return_value = handle
+-    handle.read.return_value = read_data
+-
+-    mock.return_value = handle
+-    return mock
+-
+-
+-class PropertyMock(Mock):
+-    """
+-    A mock intended to be used as a property, or other descriptor, on a class.
+-    `PropertyMock` provides `__get__` and `__set__` methods so you can specify
+-    a return value when it is fetched.
+-
+-    Fetching a `PropertyMock` instance from an object calls the mock, with
+-    no args. Setting it calls the mock with the value being set.
+-    """
+-    def _get_child_mock(self, **kwargs):
+-        return MagicMock(**kwargs)
+-
+-    def __get__(self, obj, obj_type):
+-        return self()
+-    def __set__(self, obj, val):
+-        self(val)
++from unittest.mock import *

=== added file 'debian/plainbox-insecure-policy.install'
--- debian/plainbox-insecure-policy.install	1970-01-01 00:00:00 +0000
+++ debian/plainbox-insecure-policy.install	2014-07-23 14:09:06 +0000
@@ -0,0 +1,1 @@
+plainbox/contrib/policykit_yes/org.freedesktop.policykit.pkexec.run-plainbox-job.policy usr/share/polkit-1/actions/

=== added file 'debian/plainbox-secure-policy.install'
--- debian/plainbox-secure-policy.install	1970-01-01 00:00:00 +0000
+++ debian/plainbox-secure-policy.install	2014-07-23 14:09:06 +0000
@@ -0,0 +1,1 @@
+plainbox/contrib/policykit_auth_admin_keep/org.freedesktop.policykit.pkexec.run-plainbox-job.policy usr/share/polkit-1/actions/

=== added file 'debian/plainbox.install'
--- debian/plainbox.install	1970-01-01 00:00:00 +0000
+++ debian/plainbox.install	2014-07-23 14:09:06 +0000
@@ -0,0 +1,1 @@
+usr/bin/plainbox

=== added file 'debian/plainbox.manpages'
--- debian/plainbox.manpages	1970-01-01 00:00:00 +0000
+++ debian/plainbox.manpages	2014-07-23 14:09:06 +0000
@@ -0,0 +1,25 @@
+plainbox/build/sphinx/man/CHECKBOX_DATA.7
+plainbox/build/sphinx/man/CHECKBOX_SHARE.7
+plainbox/build/sphinx/man/PLAINBOX_PROVIDER_DATA.7
+plainbox/build/sphinx/man/PLAINBOX_SESSION_SHARE.7
+plainbox/build/sphinx/man/manage.py.1
+plainbox/build/sphinx/man/plainbox-check-config.1
+plainbox/build/sphinx/man/plainbox-dev-analyze.1
+plainbox/build/sphinx/man/plainbox-dev-crash.1
+plainbox/build/sphinx/man/plainbox-dev-list.1
+plainbox/build/sphinx/man/plainbox-dev-logtest.1
+plainbox/build/sphinx/man/plainbox-dev-parse.1
+plainbox/build/sphinx/man/plainbox-dev-script.1
+plainbox/build/sphinx/man/plainbox-dev-special.1
+plainbox/build/sphinx/man/plainbox-dev.1
+plainbox/build/sphinx/man/plainbox-run.1
+plainbox/build/sphinx/man/plainbox-self-test.1
+plainbox/build/sphinx/man/plainbox-session-archive.1
+plainbox/build/sphinx/man/plainbox-session-list.1
+plainbox/build/sphinx/man/plainbox-session-remove.1
+plainbox/build/sphinx/man/plainbox-session-show.1
+plainbox/build/sphinx/man/plainbox-session-structure.7
+plainbox/build/sphinx/man/plainbox-session.1
+plainbox/build/sphinx/man/plainbox-startprovider.1
+plainbox/build/sphinx/man/plainbox.1
+plainbox/build/sphinx/man/plainbox.conf.5

=== added file 'debian/python3-plainbox-doc.doc-base'
--- debian/python3-plainbox-doc.doc-base	1970-01-01 00:00:00 +0000
+++ debian/python3-plainbox-doc.doc-base	2014-07-23 14:09:06 +0000
@@ -0,0 +1,9 @@
+Document: plainbox
+Title: Plainbox Manual
+Author: Canonical Ltd.
+Abstract: This manual describes what Plainbox is, and how it can be used.
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python3-plainbox-doc/html/index.html
+Files: /usr/share/doc/python3-plainbox-doc/html/*.html
\ No newline at end of file

=== added file 'debian/python3-plainbox-doc.docs'
--- debian/python3-plainbox-doc.docs	1970-01-01 00:00:00 +0000
+++ debian/python3-plainbox-doc.docs	2014-07-23 14:09:06 +0000
@@ -0,0 +1,1 @@
+plainbox/build/sphinx/html

=== added file 'debian/python3-plainbox.install'
--- debian/python3-plainbox.install	1970-01-01 00:00:00 +0000
+++ debian/python3-plainbox.install	2014-07-23 14:09:06 +0000
@@ -0,0 +1,5 @@
+plainbox/build/mo/* usr/share/locale 
+plainbox/plainbox/impl/providers/stubbox/build/mo/* usr/share/locale
+usr/bin/plainbox-trusted-launcher-1
+usr/lib/python3/dist-packages/plainbox-*.egg-info
+usr/lib/python3/dist-packages/plainbox/

=== added file 'debian/python3-plainbox.manpages'
--- debian/python3-plainbox.manpages	1970-01-01 00:00:00 +0000
+++ debian/python3-plainbox.manpages	2014-07-23 14:09:06 +0000
@@ -0,0 +1,1 @@
+plainbox/build/sphinx/man/plainbox-trusted-launcher-1.1

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2014-07-23 14:09:06 +0000
@@ -0,0 +1,29 @@
+#!/usr/bin/make -f
+export NO_PNG_PKG_MANGLE=1
+export LANG=
+export LANGUAGE=
+export http_proxy=http://127.0.0.9:9
+
+%:
+	dh $@ --with=python3,sphinxdoc --sourcedirectory=plainbox
+
+override_dh_auto_build:
+	cd plainbox && python3 setup.py build
+	cd plainbox && python3 setup.py build_sphinx -b html
+	cd plainbox && python3 setup.py build_sphinx -b man
+	cd plainbox && python3 setup.py build_i18n
+	cd plainbox && PYTHONPATH=. ./plainbox/impl/providers/stubbox/manage.py i18n --dont-update-pot --dont-merge-po
+
+override_dh_auto_test:
+	cd plainbox && python3 setup.py test
+
+override_dh_auto_install:
+	cd plainbox && python3 setup.py install \
+		--force --root=$(CURDIR)/debian/tmp \
+		--no-compile -O0 --install-layout=deb 
+	rm -rf $(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/plainbox/vendor/argparse
+
+override_dh_auto_clean:
+	cd plainbox && python3 setup.py clean
+	rm -rf plainbox/build
+	rm -rf plainbox/plainbox/impl/providers/stubbox/build

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2014-07-23 14:09:06 +0000
@@ -0,0 +1,1 @@
+3.0 (native)

=== added file 'debian/source/options'
--- debian/source/options	1970-01-01 00:00:00 +0000
+++ debian/source/options	2014-07-23 14:09:06 +0000
@@ -0,0 +1,1 @@
+extend-diff-ignore = ".*\.po$"

=== added directory 'debian/tests'
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2014-07-23 14:09:06 +0000
@@ -0,0 +1,2 @@
+Tests: unit-tests
+Depends: plainbox

=== added file 'debian/tests/unit-tests'
--- debian/tests/unit-tests	1970-01-01 00:00:00 +0000
+++ debian/tests/unit-tests	2014-07-23 14:09:06 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+# autopkgtest check: run plainbox unit tests and ensure everything passes
+# (C) 2013 Canonical Ltd.
+# Author: Zygmunt Krynicki <[e-mail]> 
+
+set -e
+
+cd $ADTTMP
+plainbox self-test -u -v 2>&1
+echo "unit-tests: OK"