test and fix pastebin xmlrpc import name missmatch, fixes #87

2011-11-14 17:51:12 +01:00
parent 9d3e51af9f
commit 69dfc75572
2 changed files with 17 additions and 1 deletions
--- a/_pytest/pastebin.py
+++ b/_pytest/pastebin.py
@@ -38,7 +38,11 @@ def pytest_unconfigure(config):
        del tr._tw.__dict__['write']

 def getproxy():
-    return py.std.xmlrpclib.ServerProxy(url.xmlrpc).pastes
+    if sys.version_info < (3, 0):
+        from xmlrpclib import ServerProxy
+    else:
+        from xmlrpc.client import ServerProxy
+    return ServerProxy(url.xmlrpc).pastes

 def pytest_terminal_summary(terminalreporter):
    if terminalreporter.config.option.pastebin != "failed":