From 0a6f4ad23452920a8587f76ba2380f14fefd89a4 Mon Sep 17 00:00:00 2001 From: Niklas Arens Date: Wed, 29 Aug 2018 16:22:55 +0200 Subject: [PATCH] import changes to the python 3 xmlrpc library --- confluence.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/confluence.py b/confluence.py index e6d4f95..3955969 100755 --- a/confluence.py +++ b/confluence.py @@ -14,7 +14,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import sys, xmlrpclib, argparse, string, logging +import sys, argparse, string, logging +import xmlrpc.client as xmlrpclib # # Logging @@ -318,7 +319,7 @@ def Content(args): def Connect(args): wiki_url = args.wikiurl + "/rpc/xmlrpc" - xml_server = xmlrpclib.Server(wiki_url) + xml_server = xmlrpclib.ServerProxy(wiki_url) try: token = ConfluenceAuth(xml_server,args.username,args.password).login() except xmlrpclib.Fault as err: @@ -352,8 +353,8 @@ def Actions(token,xml_server,args,content): elif args.action == "getpagesummary": page = ConfluencePage(token,xml_server,args.name,args.spacekey,content).get() - print args.delimiter.join(( - page['id'], page['space'], page['parentId'], page['title'], page['url'])) + print (args.delimiter.join(( + page['id'], page['space'], page['parentId'], page['title'], page['url']))) elif args.action == "listpages": if args.spacekey == "": @@ -363,8 +364,8 @@ def Actions(token,xml_server,args,content): for space in spaces: all_pages = ConfluenceSpace(token,xml_server).get_all_pages(space['key']) for page in all_pages: - print args.delimiter.join(( - page['id'], page['space'], page['parentId'], page['title'], page['url'])) + print (args.delimiter.join(( + page['id'], page['space'], page['parentId'], page['title'], page['url']))) elif args.action == "removepage": removed_page = ConfluencePage(token,xml_server,args.name,args.spacekey,"").remove()