Fixing the python example, Daniel

diff --git a/docs/architecture.html b/docs/architecture.html
index f669d545e31888459d26efb5826421f20b591fcc..64ba00f997e8d4314192fbe8d5e33d541b81a606 100644 (file)
--- a/docs/architecture.html
+++ b/docs/architecture.html
@@ -42,4 +42,4 @@ drivers present in driver.h:</p><ul><li>xend_internal: implements the driver fun
 </ul><p>Note that a given driver may only implement a subset of those functions,
 for example saving a domain state to disk and restoring it is only possible
 though the Xen Daemon, on the other hand all interfaces allow to query the
-runtime state of a given domain.</p><p> </p></div></div><div class="linkList2"><div class="llinks2"><h3 class="links2"><span>main menu</span></h3><ul><li><a href="index.html">Home</a></li><li><a href="news.html">Releases</a></li><li><a href="intro.html">Introduction</a></li><li><a href="architecture.html">libvirt architecture</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="format.html">XML Format</a></li><li><a href="python.html">Binding for Python</a></li><li><a href="errors.html">Handling of errors</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="html/index.html">API Menu</a></li><li><a href="examples/index.html">C code examples</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></div><div class="llinks2"><h3 class="links2"><span>related links</span></h3><ul><li><a href="https://www.redhat.com/archives/libvir-list/">Mail archive</a></li><li><a href="https://bugzilla.redhat.com/bugzilla/buglist.cgi?product=Fedora+Core&amp;component=libvirt&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;bug_status=MODIFIED&amp;short_desc_type=allwordssubstr&amp;short_desc=&amp;long_desc_type=allwordssubstr">Open bugs</a></li><li><a href="http://hg.berrange.com/libraries/sys-virt">Perl bindings</a></li><li><a href="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html">Xen project</a></li><li><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="12" value="Search..." /><input name="submit" type="submit" value="Go" /></form></li><li><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-90x34.gif" alt="Made with Libxml2 Logo" /></a></li></ul><p class="credits">Graphics and design by <a href="mail:dfong@redhat.com">Diana Fong</a></p></div></div><div id="bottom"><p class="p1"></p></div></div></body></html>
+runtime state of a given domain.</p><p></p></div></div><div class="linkList2"><div class="llinks2"><h3 class="links2"><span>main menu</span></h3><ul><li><a href="index.html">Home</a></li><li><a href="news.html">Releases</a></li><li><a href="intro.html">Introduction</a></li><li><a href="architecture.html">libvirt architecture</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="format.html">XML Format</a></li><li><a href="python.html">Binding for Python</a></li><li><a href="errors.html">Handling of errors</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="html/index.html">API Menu</a></li><li><a href="examples/index.html">C code examples</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></div><div class="llinks2"><h3 class="links2"><span>related links</span></h3><ul><li><a href="https://www.redhat.com/archives/libvir-list/">Mail archive</a></li><li><a href="https://bugzilla.redhat.com/bugzilla/buglist.cgi?product=Fedora+Core&amp;component=libvirt&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;bug_status=MODIFIED&amp;short_desc_type=allwordssubstr&amp;short_desc=&amp;long_desc_type=allwordssubstr">Open bugs</a></li><li><a href="http://hg.berrange.com/libraries/sys-virt">Perl bindings</a></li><li><a href="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html">Xen project</a></li><li><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="12" value="Search..." /><input name="submit" type="submit" value="Go" /></form></li><li><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-90x34.gif" alt="Made with Libxml2 Logo" /></a></li></ul><p class="credits">Graphics and design by <a href="mail:dfong@redhat.com">Diana Fong</a></p></div></div><div id="bottom"><p class="p1"></p></div></div></body></html>

diff --git a/docs/libvir.html b/docs/libvir.html
index e8b5f23b916a4bb71ce6cf972391504b4d8bd718..2daa9fae62bd9656ee5a8eaf11ccc962355fb9fa 100644 (file)
--- a/docs/libvir.html
+++ b/docs/libvir.html
@@ -196,7 +196,7 @@ for example saving a domain state to disk and restoring it is only possible
 though the Xen Daemon, on the other hand all interfaces allow to query the
 runtime state of a given domain.</p>
 
-<p> </p>
+<p></p>
 
 <h2><a name="Downloads">Downloads</a></h2>
 
@@ -316,18 +316,18 @@ will remain functional in spite of the evolution of the library.</p>
 <h2><a name="Python" id="Python">Binding for Python</a></h2>
 
 <p>Libvirt comes with direct support for the Python language (just make sure
-you installed the libvirt-python package if not compiling from sources).
-Also note that Daniel Berrange provides
-<a href="http://hg.berrange.com/libraries/sys-virt">bindings for Perl</a>
+you installed the libvirt-python package if not compiling from sources). Also
+note that Daniel Berrange provides <a
+href="http://hg.berrange.com/libraries/sys-virt">bindings for Perl</a>
 too.</p>
 
-<p> The Python binding should be complete and are mostly automatically generated from
-the formal description of the API in xml. The bindings are articulated around
-2 classes <code>virConnect</code> and virDomain mapping to the C types.
-Functions in the C API taking either type as argument then becomes methods
-for the classes, their name is just stripped from the virConnect or
-virDomain(Get) prefix and the first letter gets converted to lower case, for
-example the C functions:</p>
+<p>The Python binding should be complete and are mostly automatically
+generated from the formal description of the API in xml. The bindings are
+articulated around 2 classes <code>virConnect</code> and virDomain mapping to
+the C types. Functions in the C API taking either type as argument then
+becomes methods for the classes, their name is just stripped from the
+virConnect or virDomain(Get) prefix and the first letter gets converted to
+lower case, for example the C functions:</p>
 
 <p><code>int <a
 href="html/libvirt-libvirt.html#virConnectNumOfDomains">virConnectNumOfDomains</a>
@@ -375,8 +375,9 @@ if conn == None:
     print 'Failed to open connection to the hypervisor'
     sys.exit(1)
 
-dom0 = conn.<span style="color: #007F00; background-color: #FFFFFF">lookupByName</span>("Domain-0")
-if dom0 == None:
+try:
+    dom0 = conn.<span style="color: #007F00; background-color: #FFFFFF">lookupByName</span>("Domain-0")
+except:
     print 'Failed to find the main domain'
     sys.exit(1)
 
@@ -392,6 +393,7 @@ from the C API, the only points to notice are:</p>
     openReadOnly function allows the code to execute as a normal user.</li>
   <li>getting an object representing the Domain 0 using <span
     style="color: #007F00; background-color: #FFFFFF">lookupByName</span></li>
+  <li>if the domain is not found a libvirtError exception will be raised</li>
   <li>extracting and printing some informations about the domain using
     various <span
     style="color: #E50073; background-color: #FFFFFF">methods</span>

diff --git a/docs/python.html b/docs/python.html
index b0ff43e904be3d2352f7f4363e432c55428fed5e..791c8637efb82ba380257b86c626b5be08cd806e 100644 (file)
--- a/docs/python.html
+++ b/docs/python.html
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="libvirt.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>Binding for Python</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">Binding for Python</h1><p>Libvirt comes with direct support for the Python language (just make sure
-you installed the libvirt-python package if not compiling from sources).
-Also note that Daniel Berrange provides
-<a href="http://hg.berrange.com/libraries/sys-virt">bindings for Perl</a>
-too.</p><p> The Python binding should be complete and are mostly automatically generated from
-the formal description of the API in xml. The bindings are articulated around
-2 classes <code>virConnect</code> and virDomain mapping to the C types.
-Functions in the C API taking either type as argument then becomes methods
-for the classes, their name is just stripped from the virConnect or
-virDomain(Get) prefix and the first letter gets converted to lower case, for
-example the C functions:</p><p><code>int <a href="html/libvirt-libvirt.html#virConnectNumOfDomains">virConnectNumOfDomains</a>
+you installed the libvirt-python package if not compiling from sources). Also
+note that Daniel Berrange provides <a href="http://hg.berrange.com/libraries/sys-virt">bindings for Perl</a>
+too.</p><p>The Python binding should be complete and are mostly automatically
+generated from the formal description of the API in xml. The bindings are
+articulated around 2 classes <code>virConnect</code> and virDomain mapping to
+the C types. Functions in the C API taking either type as argument then
+becomes methods for the classes, their name is just stripped from the
+virConnect or virDomain(Get) prefix and the first letter gets converted to
+lower case, for example the C functions:</p><p><code>int <a href="html/libvirt-libvirt.html#virConnectNumOfDomains">virConnectNumOfDomains</a>
 (virConnectPtr conn);</code></p><p><code>int <a href="html/libvirt-libvirt.html#virDomainSetMaxMemory">virDomainSetMaxMemory</a>
 (virDomainPtr domain, unsigned long memory);</code></p><p>become</p><p><code>virConn::numOfDomains(self)</code></p><p><code>virDomain::setMaxMemory(self, memory)</code></p><p>This process is fully automated, you can get a summary of the conversion
 in the file libvirtclass.txt present in the python dir or in the docs.There
@@ -35,8 +34,9 @@ if conn == None:
     print 'Failed to open connection to the hypervisor'
     sys.exit(1)
 
-dom0 = conn.<span style="color: #007F00; background-color: #FFFFFF">lookupByName</span>("Domain-0")
-if dom0 == None:
+try:
+    dom0 = conn.<span style="color: #007F00; background-color: #FFFFFF">lookupByName</span>("Domain-0")
+except:
     print 'Failed to find the main domain'
     sys.exit(1)
 
@@ -46,6 +46,7 @@ from the C API, the only points to notice are:</p><ul><li>the import of the modu
   <li>getting a connection to the hypervisor, in that case using the
     openReadOnly function allows the code to execute as a normal user.</li>
   <li>getting an object representing the Domain 0 using <span style="color: #007F00; background-color: #FFFFFF">lookupByName</span></li>
+  <li>if the domain is not found a libvirtError exception will be raised</li>
   <li>extracting and printing some informations about the domain using
     various <span style="color: #E50073; background-color: #FFFFFF">methods</span>
     associated to the virDomain class.</li>