changeset 2738:79a147284dde

merged main
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Tue, 21 Aug 2007 13:10:34 +0200
parents 87c2948f5373 (current diff) 558a527c0ec7 (diff)
children 9fd4a16a08cc
files
diffstat 3 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/xmlrpc/_tests/test_xmlrpc.py	Mon Aug 20 01:19:13 2007 +0200
+++ b/MoinMoin/xmlrpc/_tests/test_xmlrpc.py	Tue Aug 21 13:10:34 2007 +0200
@@ -6,9 +6,10 @@
     @license: GNU GPL, see COPYING for details.
 """
 
+from xmlrpclib import Fault
+
 from MoinMoin.user import User
 from MoinMoin.xmlrpc import XmlRpcBase
-from xmlrpclib import Fault
 
 
 def test_fault_serialization(request):
@@ -26,7 +27,7 @@
     8b7d6d70fc95 for details"""
 
     result = xmlrpc.xmlrpc_system_multicall(args)
-    assert type(result[0]) == dict
+    assert type(result[0]) is dict
     assert result[0].has_key("faultCode") and result[0].has_key("faultString")
 
 def test_generate_auth_token(request):
@@ -37,7 +38,7 @@
     token = xmlrpc._generate_auth_token(usr)
 
     print "Token should be a string or unicode object and have langth of 32 chars!"
-    assert type(token) == str or type(token) == unicode
+    assert type(token) is str or type(token) is unicode
     assert len(token) == 32
 
 def test_getAuthToken(request):
--- a/jabberbot/_tests/test_xmlrpcbot.py	Mon Aug 20 01:19:13 2007 +0200
+++ b/jabberbot/_tests/test_xmlrpcbot.py	Tue Aug 21 13:10:34 2007 +0200
@@ -5,6 +5,8 @@
     @copyright: 2007 by Karol Nowak <grywacz@gmail.com>
     @license: GNU GPL, see COPYING for details.
 """
+
+import py
 from Queue import Queue
 
 try:
--- a/jabberbot/_tests/test_xmppbot.py	Mon Aug 20 01:19:13 2007 +0200
+++ b/jabberbot/_tests/test_xmppbot.py	Tue Aug 21 13:10:34 2007 +0200
@@ -6,7 +6,7 @@
     @license: GNU GPL, see COPYING for details.
 """
 
-import py.test
+import py
 from Queue import Queue
 
 try: