- cleaning up...

1 files changed, 57 insertions, 89 deletions

diff --git a/TODO.pylint b/TODO.pylint
index 0c2a364..2562f2a 100644
--- a/TODO.pylint
+++ b/TODO.pylint
@@ -5,6 +5,7 @@ umask 022 ; python setup.py build
 running build
 running build_py
 copying pyxmpp/version.py -> build/lib.linux-i686-2.3/pyxmpp
+copying pyxmpp/sasl/core.py -> build/lib.linux-i686-2.3/pyxmpp/sasl
 running build_ext
 cd examples ; rm -f pyxmpp 2>/dev/null ; ln -s ../build/lib*/pyxmpp .
 cd examples ; chmod a+x *.py
@@ -13,6 +14,7 @@ cd tests ; chmod a+x *.py
 ************* Module pyxmpp.xmppstringprep
 ignore that: W0403: 24: Uses of a deprecated module 'stringprep'
 ************* Module pyxmpp.streamsasl
+W0231: 47:StreamSASLMixIn.__init__: __init__ method from base class 'sasl.PasswordManager' is not called
 ignore that: W0201:304:StreamSASLMixIn._process_sasl_success: Attribute 'me' defined outside __init__
 ignore that: W0201:307:StreamSASLMixIn._process_sasl_success: Attribute 'authenticated' defined outside __init__
 ignore that: W0201:191:StreamSASLMixIn._process_sasl_auth: Attribute 'peer_authenticated' defined outside __init__
@@ -105,52 +107,18 @@ ignore that: W0201:183:ComponentStream._process_node: Attribute 'peer_authentica
 ignore that: W0201:178:ComponentStream._process_node: Attribute 'peer' defined outside __init__
 ************* Module pyxmpp.sasl.plain
 ignore that: W0613: 66:PlainClientAuthenticator.challenge: Unused argument 'challenge'
+ignore that: W0613: 89:PlainClientAuthenticator.finish: Unused argument 'data'
 ************* Module pyxmpp.sasl.core
-W0141:  0: Missing docstring
-W0403: 22: Uses of a deprecated module 'string'
-W0232: 27:PasswordManager: Class has no __init__ method
-W0141: 27:PasswordManager: Missing docstring
-W0141: 28:PasswordManager.get_password: Missing docstring
-W0613: 28:PasswordManager.get_password: Unused argument 'username'
-W0613: 28:PasswordManager.get_password: Unused argument 'realm'
-W0613: 28:PasswordManager.get_password: Unused argument 'acceptable_format'
-W0141: 30:PasswordManager.check_password: Missing docstring
-W0141: 35:PasswordManager.get_realms: Missing docstring
-W0141: 37:PasswordManager.choose_realm: Missing docstring
-W0141: 39:PasswordManager.check_authzid: Missing docstring
-W0102: 39:PasswordManager.check_authzid: Dangerous default value {} as argument
-E0602: 40:PasswordManager.check_authzid: Undefined variable 'username'
-W0141: 42:PasswordManager.get_serv_type: Missing docstring
-W0141: 44:PasswordManager.get_serv_host: Missing docstring
-W0141: 46:PasswordManager.get_serv_name: Missing docstring
-W0141: 49:PasswordManager.generate_nonce: Missing docstring
-W0232: 54:Reply: Class has no __init__ method
-W0141: 54:Reply: Missing docstring
-W0141: 55:Reply.base64: Missing docstring
-E0201: 56:Reply.base64: Access to undefined member 'data'
-E0201: 57:Reply.base64: Access to undefined member 'data'
-W0141: 64:Response: Missing docstring
-W0141: 70:Challenge: Missing docstring
-W0141: 76:Failure: Missing docstring
-W0141: 82:Success: Missing docstring
-W0141: 91:ClientAuthenticator: Missing docstring
-W0141: 95:ClientAuthenticator.start: Missing docstring
-E0602: 96:ClientAuthenticator.start: Undefined variable 'Abort'
-W0613: 95:ClientAuthenticator.start: Unused argument 'username'
-W0613: 95:ClientAuthenticator.start: Unused argument 'authzid'
-W0141: 97:ClientAuthenticator.challenge: Missing docstring
-E0602: 98:ClientAuthenticator.challenge: Undefined variable 'Abort'
-W0613: 97:ClientAuthenticator.challenge: Unused argument 'challenge'
-W0141: 99:ClientAuthenticator.finish: Missing docstring
-W0613: 99:ClientAuthenticator.finish: Unused argument 'data'
-E0201:100:ClientAuthenticator.finish: Access to undefined member 'authzid'
-W0141:102:ServerAuthenticator: Missing docstring
-W0141:106:ServerAuthenticator.start: Missing docstring
-W0613:106:ServerAuthenticator.start: Unused argument 'initial_response'
-W0141:108:ServerAuthenticator.response: Missing docstring
-W0613:108:ServerAuthenticator.response: Unused argument 'response'
-W0611: 22: Unused import string
-W0611: 23: Unused import sys
+W0511:184: FIXME: use some better RNG (/dev/urandom maybe)
+ignore that: W0613: 38:PasswordManager.get_password: Unused argument 'username'
+ignore that: W0613: 38:PasswordManager.get_password: Unused argument 'realm'
+ignore that: W0613: 38:PasswordManager.get_password: Unused argument 'acceptable_formats'
+ignore that: W0613:294:ClientAuthenticator.start: Unused argument 'username'
+ignore that: W0613:294:ClientAuthenticator.start: Unused argument 'authzid'
+ignore that: W0613:309:ClientAuthenticator.challenge: Unused argument 'challenge'
+ignore that: W0613:321:ClientAuthenticator.finish: Unused argument 'data'
+ignore that: W0613:351:ServerAuthenticator.start: Unused argument 'initial_response'
+ignore that: W0613:364:ServerAuthenticator.response: Unused argument 'response'
 ************* Module pyxmpp.sasl.digest_md5
 W0301: 79: Line too long (108/100)
 W0141:  0: Missing docstring
@@ -485,17 +453,17 @@ W0401:  0: Cyclic import (pyxmpp.error -> pyxmpp.stanza)
 
 Report
 ======
-5937 statements analysed.
+5946 statements analysed.
 
 Statistics by type
 ------------------
 
 type     number old number difference %documented %badname 
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-module   37     37         =          78.38       0.00     
-class    114    114        =          69.30       0.00     
+module   37     37         =          81.08       0.00     
+class    114    114        =          76.32       0.00     
 method   0      0          =          0.00        0.00     
-function 631    631        =          80.67       0.32     
+function 634    634        =          83.12       0.32     
 
 
 Raw metrics
@@ -503,10 +471,10 @@ Raw metrics
 
 type      number %     previous difference 
 :::::::::::::::::::::::::::::::::::::::::::
-code      6507   59.60 6507     =          
-docstring 3208   29.39 3208     =          
-comment   587    5.38  587      =          
-empty     615    5.63  615      =          
+code      6518   58.17 6517     +1         
+docstring 3456   30.84 3456     =          
+comment   588    5.25  588      =          
+empty     644    5.75  644      =          
 
 
 External dependencies
@@ -532,7 +500,7 @@ External dependencies
       \-idna (pyxmpp.jid,pyxmpp.dns)
     os (pyxmpp.streambase)
     types (pyxmpp.xmppstringprep,pyxmpp.roster,pyxmpp.jid,pyxmpp.dns,pyxmpp.streambase,pyxmpp.utils,pyxmpp.error,pyxmpp.sasl.digest_md5,pyxmpp.jabber.muc,pyxmpp.jabber.clientstream,pyxmpp.jabber.delay,pyxmpp.jabber.disco,pyxmpp.jabber.vcard)
-    string (pyxmpp.sasl.core,pyxmpp.sasl.digest_md5,pyxmpp.jabber.vcard)
+    string (pyxmpp.sasl.digest_md5,pyxmpp.jabber.vcard)
 
 
 
@@ -541,26 +509,26 @@ Messages
 
 message id occurences 
 ::::::::::::::::::::::
-W0141      165        
+W0141      141        
 W0201      62         
-W0613      45         
-E0201      37         
-W0611      33         
-W0102      18         
-E0602      18         
+W0613      46         
+E0201      34         
+W0611      31         
+W0102      17         
+E0602      15         
 W0311      8          
 W0612      7          
 W0221      7          
+W0511      6          
 W0133      6          
-W0511      5          
+W0231      5          
 W0622      4          
-W0403      4          
-W0232      4          
-W0231      4          
 W0112      4          
 W0103      4          
+W0403      3          
 W0301      3          
 W0115      3          
+W0232      2          
 W0151      2          
 W0111      2          
 W0401      1          
@@ -573,8 +541,8 @@ Total errors / warnings
 
 type     number previous difference 
 ::::::::::::::::::::::::::::::::::::
-warnings 393    393      =          
-errors   55     55       =          
+warnings 366    366      =          
+errors   49     51       -2         
 
 
 % errors / warnings by module
@@ -582,32 +550,32 @@ errors   55     55       =
 
 module                         error warning 
 :::::::::::::::::::::::::::::::::::::::::::::
-pyxmpp.jabber.vcard            27.27 21.63   
-pyxmpp.jid                     23.64 0.25    
-pyxmpp.jabber.muc              16.36 9.92    
-pyxmpp.sasl.core               10.91 9.92    
-pyxmpp.jabber.disco            7.27  9.92    
-pyxmpp.jabber.client           5.45  3.82    
-pyxmpp.jabber.clientstream     3.64  10.69   
-pyxmpp.jabber.delay            3.64  3.05    
-pyxmpp.sasl.digest_md5         1.82  13.99   
-pyxmpp.streambase              0.00  5.60    
-pyxmpp.dns                     0.00  2.04    
-pyxmpp.streamsasl              0.00  1.78    
-pyxmpp.clientstream            0.00  1.78    
-pyxmpp.jabberd.componentstream 0.00  1.53    
-pyxmpp.streamtls               0.00  1.02    
-pyxmpp.xmlextra                0.00  0.76    
-pyxmpp.version                 0.00  0.76    
-pyxmpp._xmlextra               0.00  0.51    
-pyxmpp.xmppstringprep          0.00  0.25    
-pyxmpp.sasl.plain              0.00  0.25    
-pyxmpp.resolver                0.00  0.25    
-pyxmpp.client                  0.00  0.25    
+pyxmpp.jabber.vcard            30.61 23.22   
+pyxmpp.jid                     26.53 0.27    
+pyxmpp.jabber.muc              18.37 10.66   
+pyxmpp.jabber.disco            8.16  10.66   
+pyxmpp.jabber.client           6.12  4.10    
+pyxmpp.jabber.clientstream     4.08  11.48   
+pyxmpp.jabber.delay            4.08  3.28    
+pyxmpp.sasl.digest_md5         2.04  15.03   
+pyxmpp.streambase              0.00  6.01    
+pyxmpp.sasl.core               0.00  2.73    
+pyxmpp.streamsasl              0.00  2.19    
+pyxmpp.dns                     0.00  2.19    
+pyxmpp.clientstream            0.00  1.91    
+pyxmpp.jabberd.componentstream 0.00  1.64    
+pyxmpp.streamtls               0.00  1.09    
+pyxmpp.xmlextra                0.00  0.82    
+pyxmpp.version                 0.00  0.82    
+pyxmpp.sasl.plain              0.00  0.55    
+pyxmpp._xmlextra               0.00  0.55    
+pyxmpp.xmppstringprep          0.00  0.27    
+pyxmpp.resolver                0.00  0.27    
+pyxmpp.client                  0.00  0.27    
 
 
 Global evaluation
 -----------------
-Your code has been rated at 8.87/10 (previous run: 8.87/10)
+Your code has been rated at 8.97/10 (previous run: 8.96/10)
 That's pretty good. Good work mate.