--- a/createdoc.py Tue Dec 06 23:53:18 2011 +0100
+++ b/createdoc.py Wed Dec 07 01:06:40 2011 +0100
@@ -91,10 +91,11 @@
title=name[0].upper()+name[1:]
Link.__init__(self,name,title)
m=methods[name]
- self.func_line=inspect.formatargspec(*inspect.getargspec(m))
+ (args, varargs, keywords, defaults)=inspect.getargspec(m)
+ args= [b for b in args if b is not "self"]
+ self.func_line=inspect.formatargspec(args, varargs, keywords, defaults)
self.description = m.__doc__.split("\n")[0]
- a=inspect.getargspec(m)
- self.args=[Arg(a,m) for a in a.args if a is not "self"]
+ self.args=[Arg(a,m) for a in args]
_, self.rets=ret(m)
--- a/doc/current.html Tue Dec 06 23:53:18 2011 +0100
+++ b/doc/current.html Wed Dec 07 01:06:40 2011 +0100
@@ -68,7 +68,7 @@
<h3>Methoden</h3>
<div class="item" id="method-startSMS">
<h4>StartSMS</h4>
- <p><code>startSMS(self, message, recipients, provider='default')</code></p>
+ <p><code>startSMS(message, recipients, provider='default')</code></p>
<p>Versendet eine SMS.</p>
<h5>Parameter</h5>
<table class="docs">
@@ -114,7 +114,7 @@
</table>
</div><div class="item" id="method-startFAX">
<h4>StartFAX</h4>
- <p><code>startFAX(self, subject, fax, recipients, provider='default')</code></p>
+ <p><code>startFAX(subject, fax, recipients, provider='default')</code></p>
<p>Versendet ein FAX.</p>
<h5>Parameter</h5>
<table class="docs">
@@ -164,7 +164,7 @@
</table>
</div><div class="item" id="method-startMail">
<h4>StartMail</h4>
- <p><code>startMail(self, subject, body, recipients, frm, provider='default')</code></p>
+ <p><code>startMail(subject, body, recipients, frm, provider='default')</code></p>
<p>Versendet eine Email.</p>
<h5>Parameter</h5>
<table class="docs">
@@ -218,7 +218,7 @@
</table>
</div><div class="item" id="method-status">
<h4>Status</h4>
- <p><code>status(self, id=None, detailed=False)</code></p>
+ <p><code>status(id=None, detailed=False)</code></p>
<p>Gibt den aktuellen Status eines Auftrages zurück.</p>
<h5>Parameter</h5>
<table class="docs">
@@ -268,7 +268,7 @@
</table>
</div><div class="item" id="method-stop">
<h4>Stop</h4>
- <p><code>stop(self, id)</code></p>
+ <p><code>stop(id)</code></p>
<p>Stoppt den angegeben Auftrag.</p>
<h5>Parameter</h5>
<table class="docs">
@@ -289,7 +289,7 @@
</table>
</div><div class="item" id="method-getProvider">
<h4>GetProvider</h4>
- <p><code>getProvider(self, typ)</code></p>
+ <p><code>getProvider(typ)</code></p>
<p>Gibt eine Liste aller verfügbaren Provider zurück.</p>
<h5>Parameter</h5>
<table class="docs">
@@ -328,7 +328,7 @@
</table>
</div><div class="item" id="method-getDefaultProvider">
<h4>GetDefaultProvider</h4>
- <p><code>getDefaultProvider(self, typ)</code></p>
+ <p><code>getDefaultProvider(typ)</code></p>
<p>Gibt den Standardprovider zurück.</p>
<h5>Parameter</h5>
<table class="docs">
Binary file doc/images/favicon.png has changed
--- a/doc/new.html Tue Dec 06 23:53:18 2011 +0100
+++ b/doc/new.html Wed Dec 07 01:06:40 2011 +0100
@@ -130,7 +130,7 @@
<h3>Methoden</h3>
<div class="item" id="method-sms">
<h4>Sms</h4>
- <p><code>sms(self, apikey, message, recipients, route='default')</code></p>
+ <p><code>sms(apikey, message, recipients, route='default')</code></p>
<p>Versendet eine SMS.</p>
<h5>Parameter</h5>
<table class="docs">
@@ -181,7 +181,7 @@
</table>
</div><div class="item" id="method-fax">
<h4>Fax</h4>
- <p><code>fax(self, apikey, subject, fax, recipients, route='default')</code></p>
+ <p><code>fax(apikey, subject, fax, recipients, route='default')</code></p>
<p>Versendet ein FAX.</p>
<h5>Parameter</h5>
<table class="docs">
@@ -236,7 +236,7 @@
</table>
</div><div class="item" id="method-mail">
<h4>Mail</h4>
- <p><code>mail(self, apikey, subject, body, recipients, frm, route='default')</code></p>
+ <p><code>mail(apikey, subject, body, recipients, frm, route='default')</code></p>
<p>Versendet eine Email.</p>
<h5>Parameter</h5>
<table class="docs">
@@ -295,7 +295,7 @@
</table>
</div><div class="item" id="method-status">
<h4>Status</h4>
- <p><code>status(self, apikey, id=None, detailed=False)</code></p>
+ <p><code>status(apikey, id=None, detailed=False)</code></p>
<p>Gibt den aktuellen Status eines Auftrages zurück.</p>
<h5>Parameter</h5>
<table class="docs">
@@ -349,7 +349,7 @@
</table>
</div><div class="item" id="method-stop">
<h4>Stop</h4>
- <p><code>stop(self, apikey, id)</code></p>
+ <p><code>stop(apikey, id)</code></p>
<p>Stoppt den angegeben Auftrag.</p>
<h5>Parameter</h5>
<table class="docs">
@@ -374,7 +374,7 @@
</table>
</div><div class="item" id="method-routes">
<h4>Routes</h4>
- <p><code>routes(self, apikey, typ)</code></p>
+ <p><code>routes(apikey, typ)</code></p>
<p>Gibt eine Liste aller verfügbaren Provider zurück.</p>
<h5>Parameter</h5>
<table class="docs">
@@ -417,7 +417,7 @@
</table>
</div><div class="item" id="method-defaultRoute">
<h4>DefaultRoute</h4>
- <p><code>defaultRoute(self, apikey, typ)</code></p>
+ <p><code>defaultRoute(apikey, typ)</code></p>
<p>Gibt den Standardprovider zurück.</p>
<h5>Parameter</h5>
<table class="docs">
