Imported Upstream version 4.3.1

doc/examples/examples.py

@@ -27,8 +27,9 @@ Example plugins
 
 # First, let's import some stuff.
 
+# api is an object containing references to all plugins and useful classes.
 # errors is a module containing all IPA specific exceptions.
-from ipalib import errors
+from ipalib import api, errors
 # Command is the base class for command plugin.
 from ipalib import Command
 # Str is a subclass of Param, it is used to define string parameters for
@@ -415,7 +416,7 @@ class exuser_find(Method):
         # patter expects them in one dict. We need to arrange that.
         for e in entries:
             e[1]['dn'] = e[0]
-        entries = [e for (_dn, e) in entries]
+        entries = [e for (dn, e) in entries]
 
         return dict(result=entries, count=len(entries), truncated=truncated)
 
@@ -438,3 +439,5 @@ class exuser_find(Method):
 # authors from doing all the dirty work. Let's take a look at them.
 
 # COMING SOON: baseldap.py classes, extending existing plugins, etc.
+
+

doc/examples/python-api.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python2
 # Authors:
 #   Jason Gerard DeRose <jderose@redhat.com>
 #
@@ -22,33 +22,27 @@
 from __future__ import print_function
 from ipalib import api
 
+# 1. Initialize ipalib
+#
+# Run ./python-api.py --help to see the global options.  Some useful options:
+#
+#   -v  Produce more verbose output
+#   -d  Produce full debugging output
+#   -e in_server=True  Force running in server mode
+#   -e xmlrpc_uri=https://foo.com/ipa/xml  # Connect to a specific server
 
-def example():
-    # 1. Initialize ipalib
-    #
-    # Run ./python-api.py --help to see the global options.  Some useful
-    # options:
-    #
-    #   -v  Produce more verbose output
-    #   -d  Produce full debugging output
-    #   -e in_server=True  Force running in server mode
-    #   -e xmlrpc_uri=https://foo.com/ipa/xml  # Connect to a specific server
+api.bootstrap_with_global_options(context='example')
+api.finalize()
 
-    api.bootstrap_with_global_options(context='example')
-    api.finalize()
+# You will need to create a connection.  If you're in_server, call
+# Backend.ldap.connect(), otherwise Backend.rpcclient.connect().
 
-    # You will need to create a connection.  If you're in_server, call
-    # Backend.ldap.connect(), otherwise Backend.rpcclient.connect().
-
-    if api.env.in_server:
-        api.Backend.ldap2.connect()
-    else:
-        api.Backend.rpcclient.connect()
-
-    # Now that you're connected, you can make calls to api.Command.whatever():
-    print('The admin user:')
-    print(api.Command.user_show(u'admin'))
+if api.env.in_server:
+    api.Backend.ldap2.connect()
+else:
+    api.Backend.rpcclient.connect()
 
 
-if __name__ == '__main__':
-    example()
+# Now that you're connected, you can make calls to api.Command.whatever():
+print('The admin user:')
+print(api.Command.user_show(u'admin'))