summaryrefslogtreecommitdiffstats
path: root/doc/development
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2014-11-10 19:55:16 +0100
committerAlexander Sulfrian <alexander@sulfrian.net>2014-11-10 19:55:16 +0100
commitda93fb540c28be3341ec0d37d1fbd90153fb750c (patch)
tree9615b3ddcc594ba5fb6a89dbce2516adab641153 /doc/development
parent389ce1a86b704222ddc9458cd49c281e7601b803 (diff)
parentf6b3d6dc89e4ba5c2ec643931394db45b8c7f176 (diff)
downloadbcfg2-da93fb540c28be3341ec0d37d1fbd90153fb750c.tar.gz
bcfg2-da93fb540c28be3341ec0d37d1fbd90153fb750c.tar.bz2
bcfg2-da93fb540c28be3341ec0d37d1fbd90153fb750c.zip
Merge remote branch 'upstream/maint'
* upstream/maint: (59 commits) Client/Tools/APT: fix pylint errors, enable check Client/Tools/APT: fix exception name SYSV: add a migration tool to change simplename attributes to simplefile doc: Update SYSV datastream format docs SYSV: change instances of simplename to simplefile Client/Tools/APT: handle exceptions gracefully Server/Plugins/Packages: add debsrc attribute to url_map schemas/packages.xsd: add default value for debsrc Options.py: Fix database OPTIONS parsing doc: Fix typos doc: Add note about Decisions fix for 1.3.6 testsuite: Fix tools __init__.py unit test Tools: Fix install of non-whitelisted services doc: Add 1.3.6 release notes fix keyboard interrupt during intial event handling Server/Core: also shutdown on exceptions during fam blocking Reporting: better exception handling Packages: add name to additional_data for Sources Packages: add name to sources YUM: Add options to enable and disable Yum plugins ... Conflicts: debian/changelog doc/conf.py doc/releases/index.txt doc/server/database.txt doc/server/plugins/generators/cfg.txt doc/server/plugins/generators/sslca.txt man/bcfg2.conf.5 misc/bcfg2-selinux.spec misc/bcfg2.spec osx/Makefile osx/macports/Portfile schemas/packages.xsd solaris-ips/MANIFEST.bcfg2-server.header solaris-ips/MANIFEST.bcfg2.header solaris-ips/Makefile solaris-ips/pkginfo.bcfg2 solaris-ips/pkginfo.bcfg2-server solaris/Makefile solaris/pkginfo.bcfg2 solaris/pkginfo.bcfg2-server src/lib/Bcfg2/Client/Client.py src/lib/Bcfg2/Client/Proxy.py src/lib/Bcfg2/Client/Tools/APT.py src/lib/Bcfg2/Client/Tools/Action.py src/lib/Bcfg2/Client/Tools/SYSV.py src/lib/Bcfg2/Client/Tools/YUM.py src/lib/Bcfg2/Client/Tools/__init__.py src/lib/Bcfg2/Options.py src/lib/Bcfg2/Reporting/Collector.py src/lib/Bcfg2/Reporting/templates/base.html src/lib/Bcfg2/Server/Admin/__init__.py src/lib/Bcfg2/Server/BuiltinCore.py src/lib/Bcfg2/Server/Core.py src/lib/Bcfg2/Server/Plugins/Packages/Apt.py src/lib/Bcfg2/Server/Plugins/Probes.py src/lib/Bcfg2/settings.py src/lib/Bcfg2/version.py testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py testsuite/Testsrc/test_code_checks.py
Diffstat (limited to 'doc/development')
-rw-r--r--doc/development/compat.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/development/compat.txt b/doc/development/compat.txt
index f90274ce5..8700c46d3 100644
--- a/doc/development/compat.txt
+++ b/doc/development/compat.txt
@@ -60,6 +60,8 @@ behavior (e.g., :func:`input`) do not cause unexpected side-effects.
+---------------------------------+--------------------------------------------------+---------------------------------------------------------+
| urlparse | :func:`urlparse.urlparse` | :func:`urllib.parse.urlparse` |
+---------------------------------+--------------------------------------------------+---------------------------------------------------------+
+| urlretrieve | :func:`urllib.urlretrieve` | :func:`urllib.request.urlretrieve` |
++---------------------------------+--------------------------------------------------+---------------------------------------------------------+
| HTTPBasicAuthHandler | :class:`urllib2.HTTPBasicAuthHandler` | :class:`urllib.request.HTTPBasicAuthHandler` |
+---------------------------------+--------------------------------------------------+---------------------------------------------------------+
| HTTPPasswordMgrWithDefaultRealm | :class:`urllib2.HTTPPasswordMgrWithDefaultRealm` | :class:`urllib.request.HTTPPasswordMgrWithDefaultRealm` |