Changes for python3#7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dsuni wants to merge 1 commit into
base:master
Choose a base branch
from
Open

Changes for python3 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildservice/__init__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,4 +18,4 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

from api import *
from .api import *
40 changes: 20 additions & 20 deletions buildservice/api.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,12 +22,12 @@
import re
import tempfile
import time
import urllib2
import urllib.request
import cgi
import xml.etree.cElementTree as ElementTree
from urllib2 import HTTPError
from urllib.error import HTTPError
from osc import conf, core
from urllib import quote, quote_plus
from urllib.parse import quote, quote_plus

prj_template = """\
<project name="%(name)s">
Expand DownExpand Up@@ -114,10 +114,10 @@ def __init__(self, apiurl=None, oscrc=None):
else:
conf.get_config()

except OSError, e:
except OSError as e:
if e.errno == 1:
# permission problem, should be the chmod(0600) issue
raise RuntimeError, 'Current user has no write permission for specified oscrc: %s' % oscrc
raise RuntimeError('Current user has no write permission for specified oscrc: %s' % oscrc)

raise # else

Expand All@@ -127,7 +127,7 @@ def __init__(self, apiurl=None, oscrc=None):
self.apiurl = conf.config['apiurl']

if not self.apiurl:
raise RuntimeError, 'No apiurl "%s" found in %s' % (apiurl, oscrc)
raise RuntimeError('No apiurl "%s" found in %s' % (apiurl, oscrc))

# Add a couple of method aliases
self.copyPackage = core.copy_pac
Expand DownExpand Up@@ -157,7 +157,7 @@ def isNewPackage(self, dst_project, dst_package):
path_args = (core.quote_plus(dst_project), core.quote_plus(dst_package)),
create_new = False,
apiurl = self.apiurl)
except urllib2.HTTPError, e:
except urllib2.HTTPError as e:
if e.code == 404:
new_pkg = True
else:
Expand DownExpand Up@@ -203,7 +203,7 @@ def createRequest(self, options_list, description, comment, supersede = False, *
request.description = description
request.state = core.RequestState(state)

supsersedereqs = []
supsersedereqs = []
for item in options_list:
if item['action'] == "submit":
request.add_action(item['action'],
Expand All@@ -215,7 +215,7 @@ def createRequest(self, options_list, description, comment, supersede = False, *
**kwargs)

if supersede == True:
supsersedereqs.extend(core.get_exact_request_list(self.apiurl, item['src_project'],
supsersedereqs.extend(core.get_exact_request_list(self.apiurl, item['src_project'],
item['tgt_project'], item['src_package'],
item['tgt_package'], req_type='submit',
req_state=['new','review', 'declined']))
Expand DownExpand Up@@ -272,7 +272,7 @@ def createRequest(self, options_list, description, comment, supersede = False, *
for req in supsersedereqs:
if req.reqid not in processed:
processed.append(req.reqid)
print"req.reqid: %s - new ID: %s\n"%(req.reqid, request.reqid)
print("req.reqid: %s - new ID: %s\n"%(req.reqid, request.reqid))
core.change_request_state(self.apiurl, req.reqid,
'superseded',
'superseded by %s' % request.reqid,
Expand DownExpand Up@@ -320,7 +320,7 @@ def get_source_file_content(apiurl, prj, pac, path, rev):
path_args = (core.quote_plus(tgt_project), core.quote_plus(tgt_package)),
create_new = False,
apiurl = self.apiurl)
except urllib2.HTTPError, e:
except urllib2.HTTPError as e:
if e.code == 404:
new_pkg = True
else:
Expand DownExpand Up@@ -371,7 +371,7 @@ def get_source_file_content(apiurl, prj, pac, path, rev):
except UnicodeDecodeError:
pass

except urllib2.HTTPError, e:
except urllib2.HTTPError as e:
e.osc_msg = 'Diff not possible'

# the result, in unicode string
Expand DownExpand Up@@ -541,7 +541,7 @@ def getProjectDiff(self, src_project, dst_project):
diff = core.server_diff(self.apiurl,
dst_project, src_package, None,
src_project, src_package, None, False)
printdiff
print(diff)

def getPackageList(self, prj, deleted=None):
query = {}
Expand DownExpand Up@@ -699,7 +699,7 @@ def getSubmitRequests(self, req_state=None, start_time=None, end_time=None, proj

submitrequests.sort(key=lambda x: x['id'])

return submitrequests
return submitrequests

def rebuild(self, project, package, target=None, code=None):
"""
Expand DownExpand Up@@ -1004,7 +1004,7 @@ def hasChanges(self, oprj, opkg, orev, tprj, tpkg):
"""
try:
tsrcmd5 = self.getPackageChecksum(tprj, tpkg)
except urllib2.HTTPError, e:
except urllib2.HTTPError as e:
if e.code == 404:
return True
else:
Expand DownExpand Up@@ -1329,7 +1329,7 @@ def createProject(self, name, repos, links=None, paths=None, build=True,
)
u = core.makeurl(self.apiurl, ['source', name, '_meta'])

printmeta.encode('utf-8')
print(meta.encode('utf-8'))
f = core.http_PUT(u, data=meta)
root = ElementTree.parse(f).getroot()
ret = root.get('code')
Expand DownExpand Up@@ -1360,7 +1360,7 @@ def createProjectAttribute(self, project, attribute, package=None, namespace="OB
xml = """
<attributes><attribute namespace='%s' name='%s'>%s</attribute></attributes>
""" % (namespace, attribute, values_xml)
printxml
print(xml)
f = core.http_POST(u, data=xml)
root = ElementTree.parse(f).getroot()
ret = root.get('code')
Expand DownExpand Up@@ -1453,7 +1453,7 @@ def submit_action_diff(self, action):
core.quote_plus(action.tgt_project),
core.quote_plus(action.tgt_package)
))
except urllib2.HTTPError, e:
except urllib2.HTTPError as e:
if e.code == 404:
new_pkg = True
else:
Expand All@@ -1466,7 +1466,7 @@ def submit_action_diff(self, action):
action.tgt_package, None, action.src_project,
action.src_package, action.src_rev,
unified=False, missingok=True)
except urllib2.HTTPError, e:
except urllib2.HTTPError as e:
try:
reason = core.ET.fromstring(e.read()).find("summary").text
except Exception:
Expand DownExpand Up@@ -1724,5 +1724,5 @@ def save(self):
for rulenode in rulenodes:
flagnode.append(rulenode)

printElementTree.tostring(self.tree)
print(ElementTree.tostring(self.tree))

6 changes: 3 additions & 3 deletions setup.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/env python3
from setuptools import setup

version = open('VERSION').read().strip()
Expand All@@ -9,6 +9,6 @@
description='Module to access OBS server',
url='https://github.com/MeeGoIntegration/python-buildservice',
packages=['buildservice'],
install_requires=['osc<0.140'],
python_requires='>=2.7,<3.0',
install_requires=['osc'],
python_requires='>=3.5',
)
12 changes: 6 additions & 6 deletions tests/diff.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from osc import conf, core
import urllib2
import random

print"Diffing 10 random packages from "+settings.testprj+" and "+settings.testprj2
print("Diffing 10 random packages from "+settings.testprj+" and "+settings.testprj2)
packages = random.sample(settings.bs.getPackageList(settings.testprj),10)
for src_package in packages:
print"Checking "+src_package
print("Checking "+src_package)
try:
diff = core.server_diff(settings.bs.apiurl,
settings.testprj, src_package, None,
settings.testprj2, src_package, None, False)
if not diff:
print"No difference"
print("No difference")
else:
printdiff
print(diff)
except urllib2.HTTPError as err:
if err.code == 404:
print"No "+src_package+" in "+settings.testprj2
print("No "+src_package+" in "+settings.testprj2)
else:
raise
10 changes: 5 additions & 5 deletions tests/get_build_results.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint

print'Checking project '+settings.testprj+':'
print('Checking project '+settings.testprj+':')
for repo in settings.bs.getProjectRepositories(settings.testprj):
print' Checking repo '+repo+':'
print' Archs:'
print(' Checking repo '+repo+':')
print(' Archs:')
pprint(settings.bs.getRepositoryArchs(settings.testprj, repo))
print' Results:'
print(' Results:')
pprint(settings.bs.getRepoResults(settings.testprj, repo))
6 changes: 3 additions & 3 deletions tests/get_meta.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings

print'project meta of '+settings.testprj+':'
print('project meta of '+settings.testprj+':')
print(settings.bs.getProjectMeta(settings.testprj))

print'package meta of '+settings.testprj+'/'+settings.testpkg+':'
print('package meta of '+settings.testprj+'/'+settings.testpkg+':')
print(settings.bs.getPackageMeta(settings.testprj,settings.testpkg))
16 changes: 8 additions & 8 deletions tests/get_packages.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint
import os

print'Checking package list of '+settings.testprj+':'
print('Checking package list of '+settings.testprj+':')
pprint(settings.bs.getPackageList(settings.testprj))

print'and targets :'
print('and targets :')
targets = settings.bs.getTargets(settings.testprj)
pprint(targets)

print'Checking status of '+settings.testprj+'/'+settings.testpkg+':'
print('Checking status of '+settings.testprj+'/'+settings.testpkg+':')
pprint(settings.bs.getPackageStatus(settings.testprj,settings.testpkg))

print'Checking file list of '+settings.testprj+'/'+settings.testpkg+':'
print('Checking file list of '+settings.testprj+'/'+settings.testpkg+':')
files = settings.bs.getPackageFileList(settings.testprj,settings.testpkg)
pprint(files)

print'Fetching file '+settings.testprj+'/'+settings.testpkg+'/'+settings.testfile+':'
print('Fetching file '+settings.testprj+'/'+settings.testpkg+'/'+settings.testfile+':')
print(settings.bs.getFile(settings.testprj,settings.testpkg,settings.testfile))

print'Checking binary list of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+':'
print('Checking binary list of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+':')
bins = settings.bs.getBinaryList(settings.testprj,targets[0],settings.testpkg)
pprint(bins)

print'Checking binary info of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+'/'+bins[2]+':'
print('Checking binary info of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+'/'+bins[2]+':')
pprint(settings.bs.getBinaryInfo(settings.testprj,targets[0],settings.testpkg,bins[2]))
6 changes: 3 additions & 3 deletions tests/get_prj_persons.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings

print'Bugowners of '+settings.testprj2
print('Bugowners of '+settings.testprj2)
print(settings.bs.getProjectPersons(settings.testprj2, 'bugowner'))
print'Maintainers of '+settings.testprj
print('Maintainers of '+settings.testprj)
print(settings.bs.getProjectPersons(settings.testprj, 'maintainer'))
18 changes: 9 additions & 9 deletions tests/requests.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint

user = settings.bs.getUserName()
print'Your username seems to be '+user
print'Creating a request for deleting '+settings.testprj+'/'+settings.testpkg
print('Your username seems to be '+user)
print('Creating a request for deleting '+settings.testprj+'/'+settings.testpkg)
options=[{'action': 'delete','tgt_project': settings.testprj,'tgt_package': settings.testpkg}]
request = settings.bs.createRequest(options,'Description','Comment',True)
print'Adding a review to previous created request with ID: '+request.reqid
print('Adding a review to previous created request with ID: '+request.reqid)
if not settings.bs.addReview(request.reqid,"Message",user):
print"Failed!"
print("Failed!")
exit()
print'Accepting the review'
print('Accepting the review')
if not settings.bs.setReviewState(request.reqid,"accepted","Message2",user):
print"Failed!"
print("Failed!")
exit()
print'Revoking the request'
print('Revoking the request')
if not settings.bs.setRequestState(request.reqid,"revoked","Message3"):
print"Failed!"
print("Failed!")
exit()
4 changes: 2 additions & 2 deletions tests/results.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint

print"Repository state of "+settings.testprj
print("Repository state of "+settings.testprj)
pprint(settings.bs.getRepoState(settings.testprj))
20 changes: 10 additions & 10 deletions tests/settings.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python3

from buildservice import BuildService
from os.path import expanduser
Expand DownExpand Up@@ -26,12 +26,12 @@

bs = BuildService(apiurl,oscrc)

print"**********************************"
print"Our test settings:"
print"API: "+apiurl
print"OSCRC: "+oscrc
print"Test project 1: "+testprj
print"Test project 2: "+testprj2
print"Test package: "+testpkg
print"Test file: "+testfile
print"**********************************"
print("**********************************")
print("Our test settings:")
print("API: "+apiurl)
print("OSCRC: "+oscrc)
print("Test project 1: "+testprj)
print("Test project 2: "+testprj2)
print("Test package: "+testpkg)
print("Test file: "+testfile)
print("**********************************")
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Changes for python3#7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

dsuni
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Changes for python3
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
buildservice/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,4 +18,4 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

from api import *
from .api import *

40 changes: 20 additions & 20 deletions
buildservice/api.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,12 +22,12 @@
import re
import tempfile
import time
import urllib2
import urllib.request
import cgi
import xml.etree.cElementTree as ElementTree
from urllib2 import HTTPError
from urllib.error import HTTPError
from osc import conf, core
from urllib import quote, quote_plus
from urllib.parse import quote, quote_plus

prj_template = """\
<project name="%(name)s">
Expand DownExpand Up@@ -114,10 +114,10 @@ def __init__(self, apiurl=None, oscrc=None):
 else:
 conf.get_config()

 except OSError, e:
 except OSError as e:
 if e.errno == 1:
 # permission problem, should be the chmod(0600) issue
 raise RuntimeError, 'Current user has no write permission for specified oscrc: %s' % oscrc
 raise RuntimeError('Current user has no write permission for specified oscrc: %s' % oscrc)

 raise # else

Expand All@@ -127,7 +127,7 @@ def __init__(self, apiurl=None, oscrc=None):
 self.apiurl = conf.config['apiurl']

 if not self.apiurl:
 raise RuntimeError, 'No apiurl "%s" found in %s' % (apiurl, oscrc)
 raise RuntimeError('No apiurl "%s" found in %s' % (apiurl, oscrc))

 # Add a couple of method aliases
 self.copyPackage = core.copy_pac
Expand DownExpand Up@@ -157,7 +157,7 @@ def isNewPackage(self, dst_project, dst_package):
 path_args = (core.quote_plus(dst_project), core.quote_plus(dst_package)),
 create_new = False,
 apiurl = self.apiurl)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 new_pkg = True
 else:
Expand DownExpand Up@@ -203,7 +203,7 @@ def createRequest(self, options_list, description, comment, supersede = False, *
 request.description = description
 request.state = core.RequestState(state)

supsersedereqs = []
supsersedereqs = []
 for item in options_list:
 if item['action'] == "submit":
 request.add_action(item['action'],
Expand All@@ -215,7 +215,7 @@ def createRequest(self, options_list, description, comment, supersede = False, *
 **kwargs)

 if supersede == True:
 supsersedereqs.extend(core.get_exact_request_list(self.apiurl, item['src_project'],
 supsersedereqs.extend(core.get_exact_request_list(self.apiurl, item['src_project'],
 item['tgt_project'], item['src_package'],
 item['tgt_package'], req_type='submit',
 req_state=['new','review', 'declined']))
Expand DownExpand Up@@ -272,7 +272,7 @@ def createRequest(self, options_list, description, comment, supersede = False, *
 for req in supsersedereqs:
 if req.reqid not in processed:
 processed.append(req.reqid)
 print"req.reqid: %s - new ID: %s\n"%(req.reqid, request.reqid)
 print("req.reqid: %s - new ID: %s\n"%(req.reqid, request.reqid))
 core.change_request_state(self.apiurl, req.reqid,
 'superseded',
 'superseded by %s' % request.reqid,
Expand DownExpand Up@@ -320,7 +320,7 @@ def get_source_file_content(apiurl, prj, pac, path, rev):
 path_args = (core.quote_plus(tgt_project), core.quote_plus(tgt_package)),
 create_new = False,
 apiurl = self.apiurl)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 new_pkg = True
 else:
Expand DownExpand Up@@ -371,7 +371,7 @@ def get_source_file_content(apiurl, prj, pac, path, rev):
 except UnicodeDecodeError:
 pass

 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 e.osc_msg = 'Diff not possible'

 # the result, in unicode string
Expand DownExpand Up@@ -541,7 +541,7 @@ def getProjectDiff(self, src_project, dst_project):
 diff = core.server_diff(self.apiurl,
 dst_project, src_package, None,
 src_project, src_package, None, False)
 printdiff
 print(diff)

 def getPackageList(self, prj, deleted=None):
 query = {}
Expand DownExpand Up@@ -699,7 +699,7 @@ def getSubmitRequests(self, req_state=None, start_time=None, end_time=None, proj

 submitrequests.sort(key=lambda x: x['id'])

return submitrequests
return submitrequests

 def rebuild(self, project, package, target=None, code=None):
 """
Expand DownExpand Up@@ -1004,7 +1004,7 @@ def hasChanges(self, oprj, opkg, orev, tprj, tpkg):
 """
 try:
 tsrcmd5 = self.getPackageChecksum(tprj, tpkg)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 return True
 else:
Expand DownExpand Up@@ -1329,7 +1329,7 @@ def createProject(self, name, repos, links=None, paths=None, build=True,
 )
 u = core.makeurl(self.apiurl, ['source', name, '_meta'])

 printmeta.encode('utf-8')
 print(meta.encode('utf-8'))
 f = core.http_PUT(u, data=meta)
 root = ElementTree.parse(f).getroot()
 ret = root.get('code')
Expand DownExpand Up@@ -1360,7 +1360,7 @@ def createProjectAttribute(self, project, attribute, package=None, namespace="OB
 xml = """
 <attributes><attribute namespace='%s' name='%s'>%s</attribute></attributes>
 """ % (namespace, attribute, values_xml)
 printxml
 print(xml)
 f = core.http_POST(u, data=xml)
 root = ElementTree.parse(f).getroot()
 ret = root.get('code')
Expand DownExpand Up@@ -1453,7 +1453,7 @@ def submit_action_diff(self, action):
 core.quote_plus(action.tgt_project),
 core.quote_plus(action.tgt_package)
 ))
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 new_pkg = True
 else:
Expand All@@ -1466,7 +1466,7 @@ def submit_action_diff(self, action):
 action.tgt_package, None, action.src_project,
 action.src_package, action.src_rev,
 unified=False, missingok=True)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 try:
 reason = core.ET.fromstring(e.read()).find("summary").text
 except Exception:
Expand DownExpand Up@@ -1724,5 +1724,5 @@ def save(self):
 for rulenode in rulenodes:
 flagnode.append(rulenode)

 printElementTree.tostring(self.tree)
 print(ElementTree.tostring(self.tree))


6 changes: 3 additions & 3 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/env python3
from setuptools import setup

version = open('VERSION').read().strip()
Expand All@@ -9,6 +9,6 @@
 description='Module to access OBS server',
 url='https://github.com/MeeGoIntegration/python-buildservice',
 packages=['buildservice'],
 install_requires=['osc<0.140'],
 python_requires='>=2.7,<3.0',
 install_requires=['osc'],
 python_requires='>=3.5',
)

12 changes: 6 additions & 6 deletions
tests/diff.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from osc import conf, core
import urllib2
import random

print"Diffing 10 random packages from "+settings.testprj+" and "+settings.testprj2
print("Diffing 10 random packages from "+settings.testprj+" and "+settings.testprj2)
packages = random.sample(settings.bs.getPackageList(settings.testprj),10)
for src_package in packages:
 print"Checking "+src_package
 print("Checking "+src_package)
 try:
 diff = core.server_diff(settings.bs.apiurl,
 settings.testprj, src_package, None,
 settings.testprj2, src_package, None, False)
 if not diff:
 print"No difference"
 print("No difference")
 else:
 printdiff
 print(diff)
 except urllib2.HTTPError as err:
 if err.code == 404:
 print"No "+src_package+" in "+settings.testprj2
 print("No "+src_package+" in "+settings.testprj2)
 else:
 raise

10 changes: 5 additions & 5 deletions
tests/get_build_results.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint

print'Checking project '+settings.testprj+':'
print('Checking project '+settings.testprj+':')
for repo in settings.bs.getProjectRepositories(settings.testprj):
 print' Checking repo '+repo+':'
 print' Archs:'
 print(' Checking repo '+repo+':')
 print(' Archs:')
 pprint(settings.bs.getRepositoryArchs(settings.testprj, repo))
 print' Results:'
 print(' Results:')
 pprint(settings.bs.getRepoResults(settings.testprj, repo))

6 changes: 3 additions & 3 deletions
tests/get_meta.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings

print'project meta of '+settings.testprj+':'
print('project meta of '+settings.testprj+':')
print(settings.bs.getProjectMeta(settings.testprj))

print'package meta of '+settings.testprj+'/'+settings.testpkg+':'
print('package meta of '+settings.testprj+'/'+settings.testpkg+':')
print(settings.bs.getPackageMeta(settings.testprj,settings.testpkg))

16 changes: 8 additions & 8 deletions
tests/get_packages.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint
import os

print'Checking package list of '+settings.testprj+':'
print('Checking package list of '+settings.testprj+':')
pprint(settings.bs.getPackageList(settings.testprj))

print'and targets :'
print('and targets :')
targets = settings.bs.getTargets(settings.testprj)
pprint(targets)

print'Checking status of '+settings.testprj+'/'+settings.testpkg+':'
print('Checking status of '+settings.testprj+'/'+settings.testpkg+':')
pprint(settings.bs.getPackageStatus(settings.testprj,settings.testpkg))

print'Checking file list of '+settings.testprj+'/'+settings.testpkg+':'
print('Checking file list of '+settings.testprj+'/'+settings.testpkg+':')
files = settings.bs.getPackageFileList(settings.testprj,settings.testpkg)
pprint(files)

print'Fetching file '+settings.testprj+'/'+settings.testpkg+'/'+settings.testfile+':'
print('Fetching file '+settings.testprj+'/'+settings.testpkg+'/'+settings.testfile+':')
print(settings.bs.getFile(settings.testprj,settings.testpkg,settings.testfile))

print'Checking binary list of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+':'
print('Checking binary list of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+':')
bins = settings.bs.getBinaryList(settings.testprj,targets[0],settings.testpkg)
pprint(bins)

print'Checking binary info of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+'/'+bins[2]+':'
print('Checking binary info of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+'/'+bins[2]+':')
pprint(settings.bs.getBinaryInfo(settings.testprj,targets[0],settings.testpkg,bins[2]))

6 changes: 3 additions & 3 deletions
tests/get_prj_persons.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings

print'Bugowners of '+settings.testprj2
print('Bugowners of '+settings.testprj2)
print(settings.bs.getProjectPersons(settings.testprj2, 'bugowner'))
print'Maintainers of '+settings.testprj
print('Maintainers of '+settings.testprj)
print(settings.bs.getProjectPersons(settings.testprj, 'maintainer'))

18 changes: 9 additions & 9 deletions
tests/requests.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint

user = settings.bs.getUserName()
print'Your username seems to be '+user
print'Creating a request for deleting '+settings.testprj+'/'+settings.testpkg
print('Your username seems to be '+user)
print('Creating a request for deleting '+settings.testprj+'/'+settings.testpkg)
options=[{'action': 'delete','tgt_project': settings.testprj,'tgt_package': settings.testpkg}]
request = settings.bs.createRequest(options,'Description','Comment',True)
print'Adding a review to previous created request with ID: '+request.reqid
print('Adding a review to previous created request with ID: '+request.reqid)
if not settings.bs.addReview(request.reqid,"Message",user):
 print"Failed!"
 print("Failed!")
 exit()
print'Accepting the review'
print('Accepting the review')
if not settings.bs.setReviewState(request.reqid,"accepted","Message2",user):
 print"Failed!"
 print("Failed!")
 exit()
print'Revoking the request'
print('Revoking the request')
if not settings.bs.setRequestState(request.reqid,"revoked","Message3"):
 print"Failed!"
 print("Failed!")
 exit()

4 changes: 2 additions & 2 deletions
tests/results.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint

print"Repository state of "+settings.testprj
print("Repository state of "+settings.testprj)
pprint(settings.bs.getRepoState(settings.testprj))

20 changes: 10 additions & 10 deletions
tests/settings.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python3

from buildservice import BuildService
from os.path import expanduser
Expand DownExpand Up@@ -26,12 +26,12 @@

bs = BuildService(apiurl,oscrc)

print"**********************************"
print"Our test settings:"
print"API: "+apiurl
print"OSCRC: "+oscrc
print"Test project 1: "+testprj
print"Test project 2: "+testprj2
print"Test package: "+testpkg
print"Test file: "+testfile
print"**********************************"
print("**********************************")
print("Our test settings:")
print("API: "+apiurl)
print("OSCRC: "+oscrc)
print("Test project 1: "+testprj)
print("Test project 2: "+testprj2)
print("Test package: "+testpkg)
print("Test file: "+testfile)
print("**********************************")

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Changes for python3#7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

dsuni
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Changes for python3
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
buildservice/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,4 +18,4 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

from api import *
from .api import *

40 changes: 20 additions & 20 deletions
buildservice/api.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,12 +22,12 @@
import re
import tempfile
import time
import urllib2
import urllib.request
import cgi
import xml.etree.cElementTree as ElementTree
from urllib2 import HTTPError
from urllib.error import HTTPError
from osc import conf, core
from urllib import quote, quote_plus
from urllib.parse import quote, quote_plus

prj_template = """\
<project name="%(name)s">
Expand DownExpand Up@@ -114,10 +114,10 @@ def __init__(self, apiurl=None, oscrc=None):
 else:
 conf.get_config()

 except OSError, e:
 except OSError as e:
 if e.errno == 1:
 # permission problem, should be the chmod(0600) issue
 raise RuntimeError, 'Current user has no write permission for specified oscrc: %s' % oscrc
 raise RuntimeError('Current user has no write permission for specified oscrc: %s' % oscrc)

 raise # else

Expand All@@ -127,7 +127,7 @@ def __init__(self, apiurl=None, oscrc=None):
 self.apiurl = conf.config['apiurl']

 if not self.apiurl:
 raise RuntimeError, 'No apiurl "%s" found in %s' % (apiurl, oscrc)
 raise RuntimeError('No apiurl "%s" found in %s' % (apiurl, oscrc))

 # Add a couple of method aliases
 self.copyPackage = core.copy_pac
Expand DownExpand Up@@ -157,7 +157,7 @@ def isNewPackage(self, dst_project, dst_package):
 path_args = (core.quote_plus(dst_project), core.quote_plus(dst_package)),
 create_new = False,
 apiurl = self.apiurl)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 new_pkg = True
 else:
Expand DownExpand Up@@ -203,7 +203,7 @@ def createRequest(self, options_list, description, comment, supersede = False, *
 request.description = description
 request.state = core.RequestState(state)

supsersedereqs = []
supsersedereqs = []
 for item in options_list:
 if item['action'] == "submit":
 request.add_action(item['action'],
Expand All@@ -215,7 +215,7 @@ def createRequest(self, options_list, description, comment, supersede = False, *
 **kwargs)

 if supersede == True:
 supsersedereqs.extend(core.get_exact_request_list(self.apiurl, item['src_project'],
 supsersedereqs.extend(core.get_exact_request_list(self.apiurl, item['src_project'],
 item['tgt_project'], item['src_package'],
 item['tgt_package'], req_type='submit',
 req_state=['new','review', 'declined']))
Expand DownExpand Up@@ -272,7 +272,7 @@ def createRequest(self, options_list, description, comment, supersede = False, *
 for req in supsersedereqs:
 if req.reqid not in processed:
 processed.append(req.reqid)
 print"req.reqid: %s - new ID: %s\n"%(req.reqid, request.reqid)
 print("req.reqid: %s - new ID: %s\n"%(req.reqid, request.reqid))
 core.change_request_state(self.apiurl, req.reqid,
 'superseded',
 'superseded by %s' % request.reqid,
Expand DownExpand Up@@ -320,7 +320,7 @@ def get_source_file_content(apiurl, prj, pac, path, rev):
 path_args = (core.quote_plus(tgt_project), core.quote_plus(tgt_package)),
 create_new = False,
 apiurl = self.apiurl)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 new_pkg = True
 else:
Expand DownExpand Up@@ -371,7 +371,7 @@ def get_source_file_content(apiurl, prj, pac, path, rev):
 except UnicodeDecodeError:
 pass

 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 e.osc_msg = 'Diff not possible'

 # the result, in unicode string
Expand DownExpand Up@@ -541,7 +541,7 @@ def getProjectDiff(self, src_project, dst_project):
 diff = core.server_diff(self.apiurl,
 dst_project, src_package, None,
 src_project, src_package, None, False)
 printdiff
 print(diff)

 def getPackageList(self, prj, deleted=None):
 query = {}
Expand DownExpand Up@@ -699,7 +699,7 @@ def getSubmitRequests(self, req_state=None, start_time=None, end_time=None, proj

 submitrequests.sort(key=lambda x: x['id'])

return submitrequests
return submitrequests

 def rebuild(self, project, package, target=None, code=None):
 """
Expand DownExpand Up@@ -1004,7 +1004,7 @@ def hasChanges(self, oprj, opkg, orev, tprj, tpkg):
 """
 try:
 tsrcmd5 = self.getPackageChecksum(tprj, tpkg)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 return True
 else:
Expand DownExpand Up@@ -1329,7 +1329,7 @@ def createProject(self, name, repos, links=None, paths=None, build=True,
 )
 u = core.makeurl(self.apiurl, ['source', name, '_meta'])

 printmeta.encode('utf-8')
 print(meta.encode('utf-8'))
 f = core.http_PUT(u, data=meta)
 root = ElementTree.parse(f).getroot()
 ret = root.get('code')
Expand DownExpand Up@@ -1360,7 +1360,7 @@ def createProjectAttribute(self, project, attribute, package=None, namespace="OB
 xml = """
 <attributes><attribute namespace='%s' name='%s'>%s</attribute></attributes>
 """ % (namespace, attribute, values_xml)
 printxml
 print(xml)
 f = core.http_POST(u, data=xml)
 root = ElementTree.parse(f).getroot()
 ret = root.get('code')
Expand DownExpand Up@@ -1453,7 +1453,7 @@ def submit_action_diff(self, action):
 core.quote_plus(action.tgt_project),
 core.quote_plus(action.tgt_package)
 ))
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 new_pkg = True
 else:
Expand All@@ -1466,7 +1466,7 @@ def submit_action_diff(self, action):
 action.tgt_package, None, action.src_project,
 action.src_package, action.src_rev,
 unified=False, missingok=True)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 try:
 reason = core.ET.fromstring(e.read()).find("summary").text
 except Exception:
Expand DownExpand Up@@ -1724,5 +1724,5 @@ def save(self):
 for rulenode in rulenodes:
 flagnode.append(rulenode)

 printElementTree.tostring(self.tree)
 print(ElementTree.tostring(self.tree))


6 changes: 3 additions & 3 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/env python3
from setuptools import setup

version = open('VERSION').read().strip()
Expand All@@ -9,6 +9,6 @@
 description='Module to access OBS server',
 url='https://github.com/MeeGoIntegration/python-buildservice',
 packages=['buildservice'],
 install_requires=['osc<0.140'],
 python_requires='>=2.7,<3.0',
 install_requires=['osc'],
 python_requires='>=3.5',
)

12 changes: 6 additions & 6 deletions
tests/diff.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from osc import conf, core
import urllib2
import random

print"Diffing 10 random packages from "+settings.testprj+" and "+settings.testprj2
print("Diffing 10 random packages from "+settings.testprj+" and "+settings.testprj2)
packages = random.sample(settings.bs.getPackageList(settings.testprj),10)
for src_package in packages:
 print"Checking "+src_package
 print("Checking "+src_package)
 try:
 diff = core.server_diff(settings.bs.apiurl,
 settings.testprj, src_package, None,
 settings.testprj2, src_package, None, False)
 if not diff:
 print"No difference"
 print("No difference")
 else:
 printdiff
 print(diff)
 except urllib2.HTTPError as err:
 if err.code == 404:
 print"No "+src_package+" in "+settings.testprj2
 print("No "+src_package+" in "+settings.testprj2)
 else:
 raise

10 changes: 5 additions & 5 deletions
tests/get_build_results.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint

print'Checking project '+settings.testprj+':'
print('Checking project '+settings.testprj+':')
for repo in settings.bs.getProjectRepositories(settings.testprj):
 print' Checking repo '+repo+':'
 print' Archs:'
 print(' Checking repo '+repo+':')
 print(' Archs:')
 pprint(settings.bs.getRepositoryArchs(settings.testprj, repo))
 print' Results:'
 print(' Results:')
 pprint(settings.bs.getRepoResults(settings.testprj, repo))

6 changes: 3 additions & 3 deletions
tests/get_meta.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings

print'project meta of '+settings.testprj+':'
print('project meta of '+settings.testprj+':')
print(settings.bs.getProjectMeta(settings.testprj))

print'package meta of '+settings.testprj+'/'+settings.testpkg+':'
print('package meta of '+settings.testprj+'/'+settings.testpkg+':')
print(settings.bs.getPackageMeta(settings.testprj,settings.testpkg))

16 changes: 8 additions & 8 deletions
tests/get_packages.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint
import os

print'Checking package list of '+settings.testprj+':'
print('Checking package list of '+settings.testprj+':')
pprint(settings.bs.getPackageList(settings.testprj))

print'and targets :'
print('and targets :')
targets = settings.bs.getTargets(settings.testprj)
pprint(targets)

print'Checking status of '+settings.testprj+'/'+settings.testpkg+':'
print('Checking status of '+settings.testprj+'/'+settings.testpkg+':')
pprint(settings.bs.getPackageStatus(settings.testprj,settings.testpkg))

print'Checking file list of '+settings.testprj+'/'+settings.testpkg+':'
print('Checking file list of '+settings.testprj+'/'+settings.testpkg+':')
files = settings.bs.getPackageFileList(settings.testprj,settings.testpkg)
pprint(files)

print'Fetching file '+settings.testprj+'/'+settings.testpkg+'/'+settings.testfile+':'
print('Fetching file '+settings.testprj+'/'+settings.testpkg+'/'+settings.testfile+':')
print(settings.bs.getFile(settings.testprj,settings.testpkg,settings.testfile))

print'Checking binary list of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+':'
print('Checking binary list of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+':')
bins = settings.bs.getBinaryList(settings.testprj,targets[0],settings.testpkg)
pprint(bins)

print'Checking binary info of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+'/'+bins[2]+':'
print('Checking binary info of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+'/'+bins[2]+':')
pprint(settings.bs.getBinaryInfo(settings.testprj,targets[0],settings.testpkg,bins[2]))

6 changes: 3 additions & 3 deletions
tests/get_prj_persons.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings

print'Bugowners of '+settings.testprj2
print('Bugowners of '+settings.testprj2)
print(settings.bs.getProjectPersons(settings.testprj2, 'bugowner'))
print'Maintainers of '+settings.testprj
print('Maintainers of '+settings.testprj)
print(settings.bs.getProjectPersons(settings.testprj, 'maintainer'))

18 changes: 9 additions & 9 deletions
tests/requests.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint

user = settings.bs.getUserName()
print'Your username seems to be '+user
print'Creating a request for deleting '+settings.testprj+'/'+settings.testpkg
print('Your username seems to be '+user)
print('Creating a request for deleting '+settings.testprj+'/'+settings.testpkg)
options=[{'action': 'delete','tgt_project': settings.testprj,'tgt_package': settings.testpkg}]
request = settings.bs.createRequest(options,'Description','Comment',True)
print'Adding a review to previous created request with ID: '+request.reqid
print('Adding a review to previous created request with ID: '+request.reqid)
if not settings.bs.addReview(request.reqid,"Message",user):
 print"Failed!"
 print("Failed!")
 exit()
print'Accepting the review'
print('Accepting the review')
if not settings.bs.setReviewState(request.reqid,"accepted","Message2",user):
 print"Failed!"
 print("Failed!")
 exit()
print'Revoking the request'
print('Revoking the request')
if not settings.bs.setRequestState(request.reqid,"revoked","Message3"):
 print"Failed!"
 print("Failed!")
 exit()

4 changes: 2 additions & 2 deletions
tests/results.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint

print"Repository state of "+settings.testprj
print("Repository state of "+settings.testprj)
pprint(settings.bs.getRepoState(settings.testprj))

20 changes: 10 additions & 10 deletions
tests/settings.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python3

from buildservice import BuildService
from os.path import expanduser
Expand DownExpand Up@@ -26,12 +26,12 @@

bs = BuildService(apiurl,oscrc)

print"**********************************"
print"Our test settings:"
print"API: "+apiurl
print"OSCRC: "+oscrc
print"Test project 1: "+testprj
print"Test project 2: "+testprj2
print"Test package: "+testpkg
print"Test file: "+testfile
print"**********************************"
print("**********************************")
print("Our test settings:")
print("API: "+apiurl)
print("OSCRC: "+oscrc)
print("Test project 1: "+testprj)
print("Test project 2: "+testprj2)
print("Test package: "+testpkg)
print("Test file: "+testfile)
print("**********************************")

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Changes for python3#7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

dsuni
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Changes for python3
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
buildservice/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,4 +18,4 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

from api import *
from .api import *

40 changes: 20 additions & 20 deletions
buildservice/api.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,12 +22,12 @@
import re
import tempfile
import time
import urllib2
import urllib.request
import cgi
import xml.etree.cElementTree as ElementTree
from urllib2 import HTTPError
from urllib.error import HTTPError
from osc import conf, core
from urllib import quote, quote_plus
from urllib.parse import quote, quote_plus

prj_template = """\
<project name="%(name)s">
Expand DownExpand Up@@ -114,10 +114,10 @@ def __init__(self, apiurl=None, oscrc=None):
 else:
 conf.get_config()

 except OSError, e:
 except OSError as e:
 if e.errno == 1:
 # permission problem, should be the chmod(0600) issue
 raise RuntimeError, 'Current user has no write permission for specified oscrc: %s' % oscrc
 raise RuntimeError('Current user has no write permission for specified oscrc: %s' % oscrc)

 raise # else

Expand All@@ -127,7 +127,7 @@ def __init__(self, apiurl=None, oscrc=None):
 self.apiurl = conf.config['apiurl']

 if not self.apiurl:
 raise RuntimeError, 'No apiurl "%s" found in %s' % (apiurl, oscrc)
 raise RuntimeError('No apiurl "%s" found in %s' % (apiurl, oscrc))

 # Add a couple of method aliases
 self.copyPackage = core.copy_pac
Expand DownExpand Up@@ -157,7 +157,7 @@ def isNewPackage(self, dst_project, dst_package):
 path_args = (core.quote_plus(dst_project), core.quote_plus(dst_package)),
 create_new = False,
 apiurl = self.apiurl)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 new_pkg = True
 else:
Expand DownExpand Up@@ -203,7 +203,7 @@ def createRequest(self, options_list, description, comment, supersede = False, *
 request.description = description
 request.state = core.RequestState(state)

supsersedereqs = []
supsersedereqs = []
 for item in options_list:
 if item['action'] == "submit":
 request.add_action(item['action'],
Expand All@@ -215,7 +215,7 @@ def createRequest(self, options_list, description, comment, supersede = False, *
 **kwargs)

 if supersede == True:
 supsersedereqs.extend(core.get_exact_request_list(self.apiurl, item['src_project'],
 supsersedereqs.extend(core.get_exact_request_list(self.apiurl, item['src_project'],
 item['tgt_project'], item['src_package'],
 item['tgt_package'], req_type='submit',
 req_state=['new','review', 'declined']))
Expand DownExpand Up@@ -272,7 +272,7 @@ def createRequest(self, options_list, description, comment, supersede = False, *
 for req in supsersedereqs:
 if req.reqid not in processed:
 processed.append(req.reqid)
 print"req.reqid: %s - new ID: %s\n"%(req.reqid, request.reqid)
 print("req.reqid: %s - new ID: %s\n"%(req.reqid, request.reqid))
 core.change_request_state(self.apiurl, req.reqid,
 'superseded',
 'superseded by %s' % request.reqid,
Expand DownExpand Up@@ -320,7 +320,7 @@ def get_source_file_content(apiurl, prj, pac, path, rev):
 path_args = (core.quote_plus(tgt_project), core.quote_plus(tgt_package)),
 create_new = False,
 apiurl = self.apiurl)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 new_pkg = True
 else:
Expand DownExpand Up@@ -371,7 +371,7 @@ def get_source_file_content(apiurl, prj, pac, path, rev):
 except UnicodeDecodeError:
 pass

 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 e.osc_msg = 'Diff not possible'

 # the result, in unicode string
Expand DownExpand Up@@ -541,7 +541,7 @@ def getProjectDiff(self, src_project, dst_project):
 diff = core.server_diff(self.apiurl,
 dst_project, src_package, None,
 src_project, src_package, None, False)
 printdiff
 print(diff)

 def getPackageList(self, prj, deleted=None):
 query = {}
Expand DownExpand Up@@ -699,7 +699,7 @@ def getSubmitRequests(self, req_state=None, start_time=None, end_time=None, proj

 submitrequests.sort(key=lambda x: x['id'])

return submitrequests
return submitrequests

 def rebuild(self, project, package, target=None, code=None):
 """
Expand DownExpand Up@@ -1004,7 +1004,7 @@ def hasChanges(self, oprj, opkg, orev, tprj, tpkg):
 """
 try:
 tsrcmd5 = self.getPackageChecksum(tprj, tpkg)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 return True
 else:
Expand DownExpand Up@@ -1329,7 +1329,7 @@ def createProject(self, name, repos, links=None, paths=None, build=True,
 )
 u = core.makeurl(self.apiurl, ['source', name, '_meta'])

 printmeta.encode('utf-8')
 print(meta.encode('utf-8'))
 f = core.http_PUT(u, data=meta)
 root = ElementTree.parse(f).getroot()
 ret = root.get('code')
Expand DownExpand Up@@ -1360,7 +1360,7 @@ def createProjectAttribute(self, project, attribute, package=None, namespace="OB
 xml = """
 <attributes><attribute namespace='%s' name='%s'>%s</attribute></attributes>
 """ % (namespace, attribute, values_xml)
 printxml
 print(xml)
 f = core.http_POST(u, data=xml)
 root = ElementTree.parse(f).getroot()
 ret = root.get('code')
Expand DownExpand Up@@ -1453,7 +1453,7 @@ def submit_action_diff(self, action):
 core.quote_plus(action.tgt_project),
 core.quote_plus(action.tgt_package)
 ))
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 new_pkg = True
 else:
Expand All@@ -1466,7 +1466,7 @@ def submit_action_diff(self, action):
 action.tgt_package, None, action.src_project,
 action.src_package, action.src_rev,
 unified=False, missingok=True)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 try:
 reason = core.ET.fromstring(e.read()).find("summary").text
 except Exception:
Expand DownExpand Up@@ -1724,5 +1724,5 @@ def save(self):
 for rulenode in rulenodes:
 flagnode.append(rulenode)

 printElementTree.tostring(self.tree)
 print(ElementTree.tostring(self.tree))


6 changes: 3 additions & 3 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/env python3
from setuptools import setup

version = open('VERSION').read().strip()
Expand All@@ -9,6 +9,6 @@
 description='Module to access OBS server',
 url='https://github.com/MeeGoIntegration/python-buildservice',
 packages=['buildservice'],
 install_requires=['osc<0.140'],
 python_requires='>=2.7,<3.0',
 install_requires=['osc'],
 python_requires='>=3.5',
)

12 changes: 6 additions & 6 deletions
tests/diff.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from osc import conf, core
import urllib2
import random

print"Diffing 10 random packages from "+settings.testprj+" and "+settings.testprj2
print("Diffing 10 random packages from "+settings.testprj+" and "+settings.testprj2)
packages = random.sample(settings.bs.getPackageList(settings.testprj),10)
for src_package in packages:
 print"Checking "+src_package
 print("Checking "+src_package)
 try:
 diff = core.server_diff(settings.bs.apiurl,
 settings.testprj, src_package, None,
 settings.testprj2, src_package, None, False)
 if not diff:
 print"No difference"
 print("No difference")
 else:
 printdiff
 print(diff)
 except urllib2.HTTPError as err:
 if err.code == 404:
 print"No "+src_package+" in "+settings.testprj2
 print("No "+src_package+" in "+settings.testprj2)
 else:
 raise

10 changes: 5 additions & 5 deletions
tests/get_build_results.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint

print'Checking project '+settings.testprj+':'
print('Checking project '+settings.testprj+':')
for repo in settings.bs.getProjectRepositories(settings.testprj):
 print' Checking repo '+repo+':'
 print' Archs:'
 print(' Checking repo '+repo+':')
 print(' Archs:')
 pprint(settings.bs.getRepositoryArchs(settings.testprj, repo))
 print' Results:'
 print(' Results:')
 pprint(settings.bs.getRepoResults(settings.testprj, repo))

6 changes: 3 additions & 3 deletions
tests/get_meta.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings

print'project meta of '+settings.testprj+':'
print('project meta of '+settings.testprj+':')
print(settings.bs.getProjectMeta(settings.testprj))

print'package meta of '+settings.testprj+'/'+settings.testpkg+':'
print('package meta of '+settings.testprj+'/'+settings.testpkg+':')
print(settings.bs.getPackageMeta(settings.testprj,settings.testpkg))

16 changes: 8 additions & 8 deletions
tests/get_packages.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint
import os

print'Checking package list of '+settings.testprj+':'
print('Checking package list of '+settings.testprj+':')
pprint(settings.bs.getPackageList(settings.testprj))

print'and targets :'
print('and targets :')
targets = settings.bs.getTargets(settings.testprj)
pprint(targets)

print'Checking status of '+settings.testprj+'/'+settings.testpkg+':'
print('Checking status of '+settings.testprj+'/'+settings.testpkg+':')
pprint(settings.bs.getPackageStatus(settings.testprj,settings.testpkg))

print'Checking file list of '+settings.testprj+'/'+settings.testpkg+':'
print('Checking file list of '+settings.testprj+'/'+settings.testpkg+':')
files = settings.bs.getPackageFileList(settings.testprj,settings.testpkg)
pprint(files)

print'Fetching file '+settings.testprj+'/'+settings.testpkg+'/'+settings.testfile+':'
print('Fetching file '+settings.testprj+'/'+settings.testpkg+'/'+settings.testfile+':')
print(settings.bs.getFile(settings.testprj,settings.testpkg,settings.testfile))

print'Checking binary list of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+':'
print('Checking binary list of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+':')
bins = settings.bs.getBinaryList(settings.testprj,targets[0],settings.testpkg)
pprint(bins)

print'Checking binary info of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+'/'+bins[2]+':'
print('Checking binary info of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+'/'+bins[2]+':')
pprint(settings.bs.getBinaryInfo(settings.testprj,targets[0],settings.testpkg,bins[2]))

6 changes: 3 additions & 3 deletions
tests/get_prj_persons.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings

print'Bugowners of '+settings.testprj2
print('Bugowners of '+settings.testprj2)
print(settings.bs.getProjectPersons(settings.testprj2, 'bugowner'))
print'Maintainers of '+settings.testprj
print('Maintainers of '+settings.testprj)
print(settings.bs.getProjectPersons(settings.testprj, 'maintainer'))

18 changes: 9 additions & 9 deletions
tests/requests.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint

user = settings.bs.getUserName()
print'Your username seems to be '+user
print'Creating a request for deleting '+settings.testprj+'/'+settings.testpkg
print('Your username seems to be '+user)
print('Creating a request for deleting '+settings.testprj+'/'+settings.testpkg)
options=[{'action': 'delete','tgt_project': settings.testprj,'tgt_package': settings.testpkg}]
request = settings.bs.createRequest(options,'Description','Comment',True)
print'Adding a review to previous created request with ID: '+request.reqid
print('Adding a review to previous created request with ID: '+request.reqid)
if not settings.bs.addReview(request.reqid,"Message",user):
 print"Failed!"
 print("Failed!")
 exit()
print'Accepting the review'
print('Accepting the review')
if not settings.bs.setReviewState(request.reqid,"accepted","Message2",user):
 print"Failed!"
 print("Failed!")
 exit()
print'Revoking the request'
print('Revoking the request')
if not settings.bs.setRequestState(request.reqid,"revoked","Message3"):
 print"Failed!"
 print("Failed!")
 exit()

4 changes: 2 additions & 2 deletions
tests/results.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint

print"Repository state of "+settings.testprj
print("Repository state of "+settings.testprj)
pprint(settings.bs.getRepoState(settings.testprj))

20 changes: 10 additions & 10 deletions
tests/settings.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python3

from buildservice import BuildService
from os.path import expanduser
Expand DownExpand Up@@ -26,12 +26,12 @@

bs = BuildService(apiurl,oscrc)

print"**********************************"
print"Our test settings:"
print"API: "+apiurl
print"OSCRC: "+oscrc
print"Test project 1: "+testprj
print"Test project 2: "+testprj2
print"Test package: "+testpkg
print"Test file: "+testfile
print"**********************************"
print("**********************************")
print("Our test settings:")
print("API: "+apiurl)
print("OSCRC: "+oscrc)
print("Test project 1: "+testprj)
print("Test project 2: "+testprj2)
print("Test package: "+testpkg)
print("Test file: "+testfile)
print("**********************************")

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Changes for python3#7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

dsuni
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Changes for python3
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
buildservice/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,4 +18,4 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

from api import *
from .api import *

40 changes: 20 additions & 20 deletions
buildservice/api.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,12 +22,12 @@
import re
import tempfile
import time
import urllib2
import urllib.request
import cgi
import xml.etree.cElementTree as ElementTree
from urllib2 import HTTPError
from urllib.error import HTTPError
from osc import conf, core
from urllib import quote, quote_plus
from urllib.parse import quote, quote_plus

prj_template = """\
<project name="%(name)s">
Expand DownExpand Up@@ -114,10 +114,10 @@ def __init__(self, apiurl=None, oscrc=None):
 else:
 conf.get_config()

 except OSError, e:
 except OSError as e:
 if e.errno == 1:
 # permission problem, should be the chmod(0600) issue
 raise RuntimeError, 'Current user has no write permission for specified oscrc: %s' % oscrc
 raise RuntimeError('Current user has no write permission for specified oscrc: %s' % oscrc)

 raise # else

Expand All@@ -127,7 +127,7 @@ def __init__(self, apiurl=None, oscrc=None):
 self.apiurl = conf.config['apiurl']

 if not self.apiurl:
 raise RuntimeError, 'No apiurl "%s" found in %s' % (apiurl, oscrc)
 raise RuntimeError('No apiurl "%s" found in %s' % (apiurl, oscrc))

 # Add a couple of method aliases
 self.copyPackage = core.copy_pac
Expand DownExpand Up@@ -157,7 +157,7 @@ def isNewPackage(self, dst_project, dst_package):
 path_args = (core.quote_plus(dst_project), core.quote_plus(dst_package)),
 create_new = False,
 apiurl = self.apiurl)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 new_pkg = True
 else:
Expand DownExpand Up@@ -203,7 +203,7 @@ def createRequest(self, options_list, description, comment, supersede = False, *
 request.description = description
 request.state = core.RequestState(state)

supsersedereqs = []
supsersedereqs = []
 for item in options_list:
 if item['action'] == "submit":
 request.add_action(item['action'],
Expand All@@ -215,7 +215,7 @@ def createRequest(self, options_list, description, comment, supersede = False, *
 **kwargs)

 if supersede == True:
 supsersedereqs.extend(core.get_exact_request_list(self.apiurl, item['src_project'],
 supsersedereqs.extend(core.get_exact_request_list(self.apiurl, item['src_project'],
 item['tgt_project'], item['src_package'],
 item['tgt_package'], req_type='submit',
 req_state=['new','review', 'declined']))
Expand DownExpand Up@@ -272,7 +272,7 @@ def createRequest(self, options_list, description, comment, supersede = False, *
 for req in supsersedereqs:
 if req.reqid not in processed:
 processed.append(req.reqid)
 print"req.reqid: %s - new ID: %s\n"%(req.reqid, request.reqid)
 print("req.reqid: %s - new ID: %s\n"%(req.reqid, request.reqid))
 core.change_request_state(self.apiurl, req.reqid,
 'superseded',
 'superseded by %s' % request.reqid,
Expand DownExpand Up@@ -320,7 +320,7 @@ def get_source_file_content(apiurl, prj, pac, path, rev):
 path_args = (core.quote_plus(tgt_project), core.quote_plus(tgt_package)),
 create_new = False,
 apiurl = self.apiurl)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 new_pkg = True
 else:
Expand DownExpand Up@@ -371,7 +371,7 @@ def get_source_file_content(apiurl, prj, pac, path, rev):
 except UnicodeDecodeError:
 pass

 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 e.osc_msg = 'Diff not possible'

 # the result, in unicode string
Expand DownExpand Up@@ -541,7 +541,7 @@ def getProjectDiff(self, src_project, dst_project):
 diff = core.server_diff(self.apiurl,
 dst_project, src_package, None,
 src_project, src_package, None, False)
 printdiff
 print(diff)

 def getPackageList(self, prj, deleted=None):
 query = {}
Expand DownExpand Up@@ -699,7 +699,7 @@ def getSubmitRequests(self, req_state=None, start_time=None, end_time=None, proj

 submitrequests.sort(key=lambda x: x['id'])

return submitrequests
return submitrequests

 def rebuild(self, project, package, target=None, code=None):
 """
Expand DownExpand Up@@ -1004,7 +1004,7 @@ def hasChanges(self, oprj, opkg, orev, tprj, tpkg):
 """
 try:
 tsrcmd5 = self.getPackageChecksum(tprj, tpkg)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 return True
 else:
Expand DownExpand Up@@ -1329,7 +1329,7 @@ def createProject(self, name, repos, links=None, paths=None, build=True,
 )
 u = core.makeurl(self.apiurl, ['source', name, '_meta'])

 printmeta.encode('utf-8')
 print(meta.encode('utf-8'))
 f = core.http_PUT(u, data=meta)
 root = ElementTree.parse(f).getroot()
 ret = root.get('code')
Expand DownExpand Up@@ -1360,7 +1360,7 @@ def createProjectAttribute(self, project, attribute, package=None, namespace="OB
 xml = """
 <attributes><attribute namespace='%s' name='%s'>%s</attribute></attributes>
 """ % (namespace, attribute, values_xml)
 printxml
 print(xml)
 f = core.http_POST(u, data=xml)
 root = ElementTree.parse(f).getroot()
 ret = root.get('code')
Expand DownExpand Up@@ -1453,7 +1453,7 @@ def submit_action_diff(self, action):
 core.quote_plus(action.tgt_project),
 core.quote_plus(action.tgt_package)
 ))
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 new_pkg = True
 else:
Expand All@@ -1466,7 +1466,7 @@ def submit_action_diff(self, action):
 action.tgt_package, None, action.src_project,
 action.src_package, action.src_rev,
 unified=False, missingok=True)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 try:
 reason = core.ET.fromstring(e.read()).find("summary").text
 except Exception:
Expand DownExpand Up@@ -1724,5 +1724,5 @@ def save(self):
 for rulenode in rulenodes:
 flagnode.append(rulenode)

 printElementTree.tostring(self.tree)
 print(ElementTree.tostring(self.tree))


6 changes: 3 additions & 3 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/env python3
from setuptools import setup

version = open('VERSION').read().strip()
Expand All@@ -9,6 +9,6 @@
 description='Module to access OBS server',
 url='https://github.com/MeeGoIntegration/python-buildservice',
 packages=['buildservice'],
 install_requires=['osc<0.140'],
 python_requires='>=2.7,<3.0',
 install_requires=['osc'],
 python_requires='>=3.5',
)

12 changes: 6 additions & 6 deletions
tests/diff.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from osc import conf, core
import urllib2
import random

print"Diffing 10 random packages from "+settings.testprj+" and "+settings.testprj2
print("Diffing 10 random packages from "+settings.testprj+" and "+settings.testprj2)
packages = random.sample(settings.bs.getPackageList(settings.testprj),10)
for src_package in packages:
 print"Checking "+src_package
 print("Checking "+src_package)
 try:
 diff = core.server_diff(settings.bs.apiurl,
 settings.testprj, src_package, None,
 settings.testprj2, src_package, None, False)
 if not diff:
 print"No difference"
 print("No difference")
 else:
 printdiff
 print(diff)
 except urllib2.HTTPError as err:
 if err.code == 404:
 print"No "+src_package+" in "+settings.testprj2
 print("No "+src_package+" in "+settings.testprj2)
 else:
 raise

10 changes: 5 additions & 5 deletions
tests/get_build_results.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint

print'Checking project '+settings.testprj+':'
print('Checking project '+settings.testprj+':')
for repo in settings.bs.getProjectRepositories(settings.testprj):
 print' Checking repo '+repo+':'
 print' Archs:'
 print(' Checking repo '+repo+':')
 print(' Archs:')
 pprint(settings.bs.getRepositoryArchs(settings.testprj, repo))
 print' Results:'
 print(' Results:')
 pprint(settings.bs.getRepoResults(settings.testprj, repo))

6 changes: 3 additions & 3 deletions
tests/get_meta.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings

print'project meta of '+settings.testprj+':'
print('project meta of '+settings.testprj+':')
print(settings.bs.getProjectMeta(settings.testprj))

print'package meta of '+settings.testprj+'/'+settings.testpkg+':'
print('package meta of '+settings.testprj+'/'+settings.testpkg+':')
print(settings.bs.getPackageMeta(settings.testprj,settings.testpkg))

16 changes: 8 additions & 8 deletions
tests/get_packages.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint
import os

print'Checking package list of '+settings.testprj+':'
print('Checking package list of '+settings.testprj+':')
pprint(settings.bs.getPackageList(settings.testprj))

print'and targets :'
print('and targets :')
targets = settings.bs.getTargets(settings.testprj)
pprint(targets)

print'Checking status of '+settings.testprj+'/'+settings.testpkg+':'
print('Checking status of '+settings.testprj+'/'+settings.testpkg+':')
pprint(settings.bs.getPackageStatus(settings.testprj,settings.testpkg))

print'Checking file list of '+settings.testprj+'/'+settings.testpkg+':'
print('Checking file list of '+settings.testprj+'/'+settings.testpkg+':')
files = settings.bs.getPackageFileList(settings.testprj,settings.testpkg)
pprint(files)

print'Fetching file '+settings.testprj+'/'+settings.testpkg+'/'+settings.testfile+':'
print('Fetching file '+settings.testprj+'/'+settings.testpkg+'/'+settings.testfile+':')
print(settings.bs.getFile(settings.testprj,settings.testpkg,settings.testfile))

print'Checking binary list of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+':'
print('Checking binary list of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+':')
bins = settings.bs.getBinaryList(settings.testprj,targets[0],settings.testpkg)
pprint(bins)

print'Checking binary info of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+'/'+bins[2]+':'
print('Checking binary info of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+'/'+bins[2]+':')
pprint(settings.bs.getBinaryInfo(settings.testprj,targets[0],settings.testpkg,bins[2]))

6 changes: 3 additions & 3 deletions
tests/get_prj_persons.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings

print'Bugowners of '+settings.testprj2
print('Bugowners of '+settings.testprj2)
print(settings.bs.getProjectPersons(settings.testprj2, 'bugowner'))
print'Maintainers of '+settings.testprj
print('Maintainers of '+settings.testprj)
print(settings.bs.getProjectPersons(settings.testprj, 'maintainer'))

18 changes: 9 additions & 9 deletions
tests/requests.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint

user = settings.bs.getUserName()
print'Your username seems to be '+user
print'Creating a request for deleting '+settings.testprj+'/'+settings.testpkg
print('Your username seems to be '+user)
print('Creating a request for deleting '+settings.testprj+'/'+settings.testpkg)
options=[{'action': 'delete','tgt_project': settings.testprj,'tgt_package': settings.testpkg}]
request = settings.bs.createRequest(options,'Description','Comment',True)
print'Adding a review to previous created request with ID: '+request.reqid
print('Adding a review to previous created request with ID: '+request.reqid)
if not settings.bs.addReview(request.reqid,"Message",user):
 print"Failed!"
 print("Failed!")
 exit()
print'Accepting the review'
print('Accepting the review')
if not settings.bs.setReviewState(request.reqid,"accepted","Message2",user):
 print"Failed!"
 print("Failed!")
 exit()
print'Revoking the request'
print('Revoking the request')
if not settings.bs.setRequestState(request.reqid,"revoked","Message3"):
 print"Failed!"
 print("Failed!")
 exit()

4 changes: 2 additions & 2 deletions
tests/results.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint

print"Repository state of "+settings.testprj
print("Repository state of "+settings.testprj)
pprint(settings.bs.getRepoState(settings.testprj))

20 changes: 10 additions & 10 deletions
tests/settings.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python3

from buildservice import BuildService
from os.path import expanduser
Expand DownExpand Up@@ -26,12 +26,12 @@

bs = BuildService(apiurl,oscrc)

print"**********************************"
print"Our test settings:"
print"API: "+apiurl
print"OSCRC: "+oscrc
print"Test project 1: "+testprj
print"Test project 2: "+testprj2
print"Test package: "+testpkg
print"Test file: "+testfile
print"**********************************"
print("**********************************")
print("Our test settings:")
print("API: "+apiurl)
print("OSCRC: "+oscrc)
print("Test project 1: "+testprj)
print("Test project 2: "+testprj2)
print("Test package: "+testpkg)
print("Test file: "+testfile)
print("**********************************")

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Changes for python3#7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

dsuni
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Changes for python3
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
buildservice/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,4 +18,4 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

from api import *
from .api import *

40 changes: 20 additions & 20 deletions
buildservice/api.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,12 +22,12 @@
import re
import tempfile
import time
import urllib2
import urllib.request
import cgi
import xml.etree.cElementTree as ElementTree
from urllib2 import HTTPError
from urllib.error import HTTPError
from osc import conf, core
from urllib import quote, quote_plus
from urllib.parse import quote, quote_plus

prj_template = """\
<project name="%(name)s">
Expand DownExpand Up@@ -114,10 +114,10 @@ def __init__(self, apiurl=None, oscrc=None):
 else:
 conf.get_config()

 except OSError, e:
 except OSError as e:
 if e.errno == 1:
 # permission problem, should be the chmod(0600) issue
 raise RuntimeError, 'Current user has no write permission for specified oscrc: %s' % oscrc
 raise RuntimeError('Current user has no write permission for specified oscrc: %s' % oscrc)

 raise # else

Expand All@@ -127,7 +127,7 @@ def __init__(self, apiurl=None, oscrc=None):
 self.apiurl = conf.config['apiurl']

 if not self.apiurl:
 raise RuntimeError, 'No apiurl "%s" found in %s' % (apiurl, oscrc)
 raise RuntimeError('No apiurl "%s" found in %s' % (apiurl, oscrc))

 # Add a couple of method aliases
 self.copyPackage = core.copy_pac
Expand DownExpand Up@@ -157,7 +157,7 @@ def isNewPackage(self, dst_project, dst_package):
 path_args = (core.quote_plus(dst_project), core.quote_plus(dst_package)),
 create_new = False,
 apiurl = self.apiurl)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 new_pkg = True
 else:
Expand DownExpand Up@@ -203,7 +203,7 @@ def createRequest(self, options_list, description, comment, supersede = False, *
 request.description = description
 request.state = core.RequestState(state)

supsersedereqs = []
supsersedereqs = []
 for item in options_list:
 if item['action'] == "submit":
 request.add_action(item['action'],
Expand All@@ -215,7 +215,7 @@ def createRequest(self, options_list, description, comment, supersede = False, *
 **kwargs)

 if supersede == True:
 supsersedereqs.extend(core.get_exact_request_list(self.apiurl, item['src_project'],
 supsersedereqs.extend(core.get_exact_request_list(self.apiurl, item['src_project'],
 item['tgt_project'], item['src_package'],
 item['tgt_package'], req_type='submit',
 req_state=['new','review', 'declined']))
Expand DownExpand Up@@ -272,7 +272,7 @@ def createRequest(self, options_list, description, comment, supersede = False, *
 for req in supsersedereqs:
 if req.reqid not in processed:
 processed.append(req.reqid)
 print"req.reqid: %s - new ID: %s\n"%(req.reqid, request.reqid)
 print("req.reqid: %s - new ID: %s\n"%(req.reqid, request.reqid))
 core.change_request_state(self.apiurl, req.reqid,
 'superseded',
 'superseded by %s' % request.reqid,
Expand DownExpand Up@@ -320,7 +320,7 @@ def get_source_file_content(apiurl, prj, pac, path, rev):
 path_args = (core.quote_plus(tgt_project), core.quote_plus(tgt_package)),
 create_new = False,
 apiurl = self.apiurl)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 new_pkg = True
 else:
Expand DownExpand Up@@ -371,7 +371,7 @@ def get_source_file_content(apiurl, prj, pac, path, rev):
 except UnicodeDecodeError:
 pass

 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 e.osc_msg = 'Diff not possible'

 # the result, in unicode string
Expand DownExpand Up@@ -541,7 +541,7 @@ def getProjectDiff(self, src_project, dst_project):
 diff = core.server_diff(self.apiurl,
 dst_project, src_package, None,
 src_project, src_package, None, False)
 printdiff
 print(diff)

 def getPackageList(self, prj, deleted=None):
 query = {}
Expand DownExpand Up@@ -699,7 +699,7 @@ def getSubmitRequests(self, req_state=None, start_time=None, end_time=None, proj

 submitrequests.sort(key=lambda x: x['id'])

return submitrequests
return submitrequests

 def rebuild(self, project, package, target=None, code=None):
 """
Expand DownExpand Up@@ -1004,7 +1004,7 @@ def hasChanges(self, oprj, opkg, orev, tprj, tpkg):
 """
 try:
 tsrcmd5 = self.getPackageChecksum(tprj, tpkg)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 return True
 else:
Expand DownExpand Up@@ -1329,7 +1329,7 @@ def createProject(self, name, repos, links=None, paths=None, build=True,
 )
 u = core.makeurl(self.apiurl, ['source', name, '_meta'])

 printmeta.encode('utf-8')
 print(meta.encode('utf-8'))
 f = core.http_PUT(u, data=meta)
 root = ElementTree.parse(f).getroot()
 ret = root.get('code')
Expand DownExpand Up@@ -1360,7 +1360,7 @@ def createProjectAttribute(self, project, attribute, package=None, namespace="OB
 xml = """
 <attributes><attribute namespace='%s' name='%s'>%s</attribute></attributes>
 """ % (namespace, attribute, values_xml)
 printxml
 print(xml)
 f = core.http_POST(u, data=xml)
 root = ElementTree.parse(f).getroot()
 ret = root.get('code')
Expand DownExpand Up@@ -1453,7 +1453,7 @@ def submit_action_diff(self, action):
 core.quote_plus(action.tgt_project),
 core.quote_plus(action.tgt_package)
 ))
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 new_pkg = True
 else:
Expand All@@ -1466,7 +1466,7 @@ def submit_action_diff(self, action):
 action.tgt_package, None, action.src_project,
 action.src_package, action.src_rev,
 unified=False, missingok=True)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 try:
 reason = core.ET.fromstring(e.read()).find("summary").text
 except Exception:
Expand DownExpand Up@@ -1724,5 +1724,5 @@ def save(self):
 for rulenode in rulenodes:
 flagnode.append(rulenode)

 printElementTree.tostring(self.tree)
 print(ElementTree.tostring(self.tree))


6 changes: 3 additions & 3 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/env python3
from setuptools import setup

version = open('VERSION').read().strip()
Expand All@@ -9,6 +9,6 @@
 description='Module to access OBS server',
 url='https://github.com/MeeGoIntegration/python-buildservice',
 packages=['buildservice'],
 install_requires=['osc<0.140'],
 python_requires='>=2.7,<3.0',
 install_requires=['osc'],
 python_requires='>=3.5',
)

12 changes: 6 additions & 6 deletions
tests/diff.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from osc import conf, core
import urllib2
import random

print"Diffing 10 random packages from "+settings.testprj+" and "+settings.testprj2
print("Diffing 10 random packages from "+settings.testprj+" and "+settings.testprj2)
packages = random.sample(settings.bs.getPackageList(settings.testprj),10)
for src_package in packages:
 print"Checking "+src_package
 print("Checking "+src_package)
 try:
 diff = core.server_diff(settings.bs.apiurl,
 settings.testprj, src_package, None,
 settings.testprj2, src_package, None, False)
 if not diff:
 print"No difference"
 print("No difference")
 else:
 printdiff
 print(diff)
 except urllib2.HTTPError as err:
 if err.code == 404:
 print"No "+src_package+" in "+settings.testprj2
 print("No "+src_package+" in "+settings.testprj2)
 else:
 raise

10 changes: 5 additions & 5 deletions
tests/get_build_results.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint

print'Checking project '+settings.testprj+':'
print('Checking project '+settings.testprj+':')
for repo in settings.bs.getProjectRepositories(settings.testprj):
 print' Checking repo '+repo+':'
 print' Archs:'
 print(' Checking repo '+repo+':')
 print(' Archs:')
 pprint(settings.bs.getRepositoryArchs(settings.testprj, repo))
 print' Results:'
 print(' Results:')
 pprint(settings.bs.getRepoResults(settings.testprj, repo))

6 changes: 3 additions & 3 deletions
tests/get_meta.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings

print'project meta of '+settings.testprj+':'
print('project meta of '+settings.testprj+':')
print(settings.bs.getProjectMeta(settings.testprj))

print'package meta of '+settings.testprj+'/'+settings.testpkg+':'
print('package meta of '+settings.testprj+'/'+settings.testpkg+':')
print(settings.bs.getPackageMeta(settings.testprj,settings.testpkg))

16 changes: 8 additions & 8 deletions
tests/get_packages.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint
import os

print'Checking package list of '+settings.testprj+':'
print('Checking package list of '+settings.testprj+':')
pprint(settings.bs.getPackageList(settings.testprj))

print'and targets :'
print('and targets :')
targets = settings.bs.getTargets(settings.testprj)
pprint(targets)

print'Checking status of '+settings.testprj+'/'+settings.testpkg+':'
print('Checking status of '+settings.testprj+'/'+settings.testpkg+':')
pprint(settings.bs.getPackageStatus(settings.testprj,settings.testpkg))

print'Checking file list of '+settings.testprj+'/'+settings.testpkg+':'
print('Checking file list of '+settings.testprj+'/'+settings.testpkg+':')
files = settings.bs.getPackageFileList(settings.testprj,settings.testpkg)
pprint(files)

print'Fetching file '+settings.testprj+'/'+settings.testpkg+'/'+settings.testfile+':'
print('Fetching file '+settings.testprj+'/'+settings.testpkg+'/'+settings.testfile+':')
print(settings.bs.getFile(settings.testprj,settings.testpkg,settings.testfile))

print'Checking binary list of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+':'
print('Checking binary list of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+':')
bins = settings.bs.getBinaryList(settings.testprj,targets[0],settings.testpkg)
pprint(bins)

print'Checking binary info of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+'/'+bins[2]+':'
print('Checking binary info of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+'/'+bins[2]+':')
pprint(settings.bs.getBinaryInfo(settings.testprj,targets[0],settings.testpkg,bins[2]))

6 changes: 3 additions & 3 deletions
tests/get_prj_persons.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings

print'Bugowners of '+settings.testprj2
print('Bugowners of '+settings.testprj2)
print(settings.bs.getProjectPersons(settings.testprj2, 'bugowner'))
print'Maintainers of '+settings.testprj
print('Maintainers of '+settings.testprj)
print(settings.bs.getProjectPersons(settings.testprj, 'maintainer'))

18 changes: 9 additions & 9 deletions
tests/requests.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint

user = settings.bs.getUserName()
print'Your username seems to be '+user
print'Creating a request for deleting '+settings.testprj+'/'+settings.testpkg
print('Your username seems to be '+user)
print('Creating a request for deleting '+settings.testprj+'/'+settings.testpkg)
options=[{'action': 'delete','tgt_project': settings.testprj,'tgt_package': settings.testpkg}]
request = settings.bs.createRequest(options,'Description','Comment',True)
print'Adding a review to previous created request with ID: '+request.reqid
print('Adding a review to previous created request with ID: '+request.reqid)
if not settings.bs.addReview(request.reqid,"Message",user):
 print"Failed!"
 print("Failed!")
 exit()
print'Accepting the review'
print('Accepting the review')
if not settings.bs.setReviewState(request.reqid,"accepted","Message2",user):
 print"Failed!"
 print("Failed!")
 exit()
print'Revoking the request'
print('Revoking the request')
if not settings.bs.setRequestState(request.reqid,"revoked","Message3"):
 print"Failed!"
 print("Failed!")
 exit()

4 changes: 2 additions & 2 deletions
tests/results.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint

print"Repository state of "+settings.testprj
print("Repository state of "+settings.testprj)
pprint(settings.bs.getRepoState(settings.testprj))

20 changes: 10 additions & 10 deletions
tests/settings.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python3

from buildservice import BuildService
from os.path import expanduser
Expand DownExpand Up@@ -26,12 +26,12 @@

bs = BuildService(apiurl,oscrc)

print"**********************************"
print"Our test settings:"
print"API: "+apiurl
print"OSCRC: "+oscrc
print"Test project 1: "+testprj
print"Test project 2: "+testprj2
print"Test package: "+testpkg
print"Test file: "+testfile
print"**********************************"
print("**********************************")
print("Our test settings:")
print("API: "+apiurl)
print("OSCRC: "+oscrc)
print("Test project 1: "+testprj)
print("Test project 2: "+testprj2)
print("Test package: "+testpkg)
print("Test file: "+testfile)
print("**********************************")

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Changes for python3#7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

dsuni
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Changes for python3
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
buildservice/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,4 +18,4 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

from api import *
from .api import *

40 changes: 20 additions & 20 deletions
buildservice/api.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,12 +22,12 @@
import re
import tempfile
import time
import urllib2
import urllib.request
import cgi
import xml.etree.cElementTree as ElementTree
from urllib2 import HTTPError
from urllib.error import HTTPError
from osc import conf, core
from urllib import quote, quote_plus
from urllib.parse import quote, quote_plus

prj_template = """\
<project name="%(name)s">
Expand DownExpand Up@@ -114,10 +114,10 @@ def __init__(self, apiurl=None, oscrc=None):
 else:
 conf.get_config()

 except OSError, e:
 except OSError as e:
 if e.errno == 1:
 # permission problem, should be the chmod(0600) issue
 raise RuntimeError, 'Current user has no write permission for specified oscrc: %s' % oscrc
 raise RuntimeError('Current user has no write permission for specified oscrc: %s' % oscrc)

 raise # else

Expand All@@ -127,7 +127,7 @@ def __init__(self, apiurl=None, oscrc=None):
 self.apiurl = conf.config['apiurl']

 if not self.apiurl:
 raise RuntimeError, 'No apiurl "%s" found in %s' % (apiurl, oscrc)
 raise RuntimeError('No apiurl "%s" found in %s' % (apiurl, oscrc))

 # Add a couple of method aliases
 self.copyPackage = core.copy_pac
Expand DownExpand Up@@ -157,7 +157,7 @@ def isNewPackage(self, dst_project, dst_package):
 path_args = (core.quote_plus(dst_project), core.quote_plus(dst_package)),
 create_new = False,
 apiurl = self.apiurl)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 new_pkg = True
 else:
Expand DownExpand Up@@ -203,7 +203,7 @@ def createRequest(self, options_list, description, comment, supersede = False, *
 request.description = description
 request.state = core.RequestState(state)

supsersedereqs = []
supsersedereqs = []
 for item in options_list:
 if item['action'] == "submit":
 request.add_action(item['action'],
Expand All@@ -215,7 +215,7 @@ def createRequest(self, options_list, description, comment, supersede = False, *
 **kwargs)

 if supersede == True:
 supsersedereqs.extend(core.get_exact_request_list(self.apiurl, item['src_project'],
 supsersedereqs.extend(core.get_exact_request_list(self.apiurl, item['src_project'],
 item['tgt_project'], item['src_package'],
 item['tgt_package'], req_type='submit',
 req_state=['new','review', 'declined']))
Expand DownExpand Up@@ -272,7 +272,7 @@ def createRequest(self, options_list, description, comment, supersede = False, *
 for req in supsersedereqs:
 if req.reqid not in processed:
 processed.append(req.reqid)
 print"req.reqid: %s - new ID: %s\n"%(req.reqid, request.reqid)
 print("req.reqid: %s - new ID: %s\n"%(req.reqid, request.reqid))
 core.change_request_state(self.apiurl, req.reqid,
 'superseded',
 'superseded by %s' % request.reqid,
Expand DownExpand Up@@ -320,7 +320,7 @@ def get_source_file_content(apiurl, prj, pac, path, rev):
 path_args = (core.quote_plus(tgt_project), core.quote_plus(tgt_package)),
 create_new = False,
 apiurl = self.apiurl)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 new_pkg = True
 else:
Expand DownExpand Up@@ -371,7 +371,7 @@ def get_source_file_content(apiurl, prj, pac, path, rev):
 except UnicodeDecodeError:
 pass

 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 e.osc_msg = 'Diff not possible'

 # the result, in unicode string
Expand DownExpand Up@@ -541,7 +541,7 @@ def getProjectDiff(self, src_project, dst_project):
 diff = core.server_diff(self.apiurl,
 dst_project, src_package, None,
 src_project, src_package, None, False)
 printdiff
 print(diff)

 def getPackageList(self, prj, deleted=None):
 query = {}
Expand DownExpand Up@@ -699,7 +699,7 @@ def getSubmitRequests(self, req_state=None, start_time=None, end_time=None, proj

 submitrequests.sort(key=lambda x: x['id'])

return submitrequests
return submitrequests

 def rebuild(self, project, package, target=None, code=None):
 """
Expand DownExpand Up@@ -1004,7 +1004,7 @@ def hasChanges(self, oprj, opkg, orev, tprj, tpkg):
 """
 try:
 tsrcmd5 = self.getPackageChecksum(tprj, tpkg)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 return True
 else:
Expand DownExpand Up@@ -1329,7 +1329,7 @@ def createProject(self, name, repos, links=None, paths=None, build=True,
 )
 u = core.makeurl(self.apiurl, ['source', name, '_meta'])

 printmeta.encode('utf-8')
 print(meta.encode('utf-8'))
 f = core.http_PUT(u, data=meta)
 root = ElementTree.parse(f).getroot()
 ret = root.get('code')
Expand DownExpand Up@@ -1360,7 +1360,7 @@ def createProjectAttribute(self, project, attribute, package=None, namespace="OB
 xml = """
 <attributes><attribute namespace='%s' name='%s'>%s</attribute></attributes>
 """ % (namespace, attribute, values_xml)
 printxml
 print(xml)
 f = core.http_POST(u, data=xml)
 root = ElementTree.parse(f).getroot()
 ret = root.get('code')
Expand DownExpand Up@@ -1453,7 +1453,7 @@ def submit_action_diff(self, action):
 core.quote_plus(action.tgt_project),
 core.quote_plus(action.tgt_package)
 ))
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 new_pkg = True
 else:
Expand All@@ -1466,7 +1466,7 @@ def submit_action_diff(self, action):
 action.tgt_package, None, action.src_project,
 action.src_package, action.src_rev,
 unified=False, missingok=True)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 try:
 reason = core.ET.fromstring(e.read()).find("summary").text
 except Exception:
Expand DownExpand Up@@ -1724,5 +1724,5 @@ def save(self):
 for rulenode in rulenodes:
 flagnode.append(rulenode)

 printElementTree.tostring(self.tree)
 print(ElementTree.tostring(self.tree))


6 changes: 3 additions & 3 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/env python3
from setuptools import setup

version = open('VERSION').read().strip()
Expand All@@ -9,6 +9,6 @@
 description='Module to access OBS server',
 url='https://github.com/MeeGoIntegration/python-buildservice',
 packages=['buildservice'],
 install_requires=['osc<0.140'],
 python_requires='>=2.7,<3.0',
 install_requires=['osc'],
 python_requires='>=3.5',
)

12 changes: 6 additions & 6 deletions
tests/diff.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from osc import conf, core
import urllib2
import random

print"Diffing 10 random packages from "+settings.testprj+" and "+settings.testprj2
print("Diffing 10 random packages from "+settings.testprj+" and "+settings.testprj2)
packages = random.sample(settings.bs.getPackageList(settings.testprj),10)
for src_package in packages:
 print"Checking "+src_package
 print("Checking "+src_package)
 try:
 diff = core.server_diff(settings.bs.apiurl,
 settings.testprj, src_package, None,
 settings.testprj2, src_package, None, False)
 if not diff:
 print"No difference"
 print("No difference")
 else:
 printdiff
 print(diff)
 except urllib2.HTTPError as err:
 if err.code == 404:
 print"No "+src_package+" in "+settings.testprj2
 print("No "+src_package+" in "+settings.testprj2)
 else:
 raise

10 changes: 5 additions & 5 deletions
tests/get_build_results.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint

print'Checking project '+settings.testprj+':'
print('Checking project '+settings.testprj+':')
for repo in settings.bs.getProjectRepositories(settings.testprj):
 print' Checking repo '+repo+':'
 print' Archs:'
 print(' Checking repo '+repo+':')
 print(' Archs:')
 pprint(settings.bs.getRepositoryArchs(settings.testprj, repo))
 print' Results:'
 print(' Results:')
 pprint(settings.bs.getRepoResults(settings.testprj, repo))

6 changes: 3 additions & 3 deletions
tests/get_meta.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings

print'project meta of '+settings.testprj+':'
print('project meta of '+settings.testprj+':')
print(settings.bs.getProjectMeta(settings.testprj))

print'package meta of '+settings.testprj+'/'+settings.testpkg+':'
print('package meta of '+settings.testprj+'/'+settings.testpkg+':')
print(settings.bs.getPackageMeta(settings.testprj,settings.testpkg))

16 changes: 8 additions & 8 deletions
tests/get_packages.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint
import os

print'Checking package list of '+settings.testprj+':'
print('Checking package list of '+settings.testprj+':')
pprint(settings.bs.getPackageList(settings.testprj))

print'and targets :'
print('and targets :')
targets = settings.bs.getTargets(settings.testprj)
pprint(targets)

print'Checking status of '+settings.testprj+'/'+settings.testpkg+':'
print('Checking status of '+settings.testprj+'/'+settings.testpkg+':')
pprint(settings.bs.getPackageStatus(settings.testprj,settings.testpkg))

print'Checking file list of '+settings.testprj+'/'+settings.testpkg+':'
print('Checking file list of '+settings.testprj+'/'+settings.testpkg+':')
files = settings.bs.getPackageFileList(settings.testprj,settings.testpkg)
pprint(files)

print'Fetching file '+settings.testprj+'/'+settings.testpkg+'/'+settings.testfile+':'
print('Fetching file '+settings.testprj+'/'+settings.testpkg+'/'+settings.testfile+':')
print(settings.bs.getFile(settings.testprj,settings.testpkg,settings.testfile))

print'Checking binary list of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+':'
print('Checking binary list of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+':')
bins = settings.bs.getBinaryList(settings.testprj,targets[0],settings.testpkg)
pprint(bins)

print'Checking binary info of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+'/'+bins[2]+':'
print('Checking binary info of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+'/'+bins[2]+':')
pprint(settings.bs.getBinaryInfo(settings.testprj,targets[0],settings.testpkg,bins[2]))

6 changes: 3 additions & 3 deletions
tests/get_prj_persons.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings

print'Bugowners of '+settings.testprj2
print('Bugowners of '+settings.testprj2)
print(settings.bs.getProjectPersons(settings.testprj2, 'bugowner'))
print'Maintainers of '+settings.testprj
print('Maintainers of '+settings.testprj)
print(settings.bs.getProjectPersons(settings.testprj, 'maintainer'))

18 changes: 9 additions & 9 deletions
tests/requests.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint

user = settings.bs.getUserName()
print'Your username seems to be '+user
print'Creating a request for deleting '+settings.testprj+'/'+settings.testpkg
print('Your username seems to be '+user)
print('Creating a request for deleting '+settings.testprj+'/'+settings.testpkg)
options=[{'action': 'delete','tgt_project': settings.testprj,'tgt_package': settings.testpkg}]
request = settings.bs.createRequest(options,'Description','Comment',True)
print'Adding a review to previous created request with ID: '+request.reqid
print('Adding a review to previous created request with ID: '+request.reqid)
if not settings.bs.addReview(request.reqid,"Message",user):
 print"Failed!"
 print("Failed!")
 exit()
print'Accepting the review'
print('Accepting the review')
if not settings.bs.setReviewState(request.reqid,"accepted","Message2",user):
 print"Failed!"
 print("Failed!")
 exit()
print'Revoking the request'
print('Revoking the request')
if not settings.bs.setRequestState(request.reqid,"revoked","Message3"):
 print"Failed!"
 print("Failed!")
 exit()

4 changes: 2 additions & 2 deletions
tests/results.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint

print"Repository state of "+settings.testprj
print("Repository state of "+settings.testprj)
pprint(settings.bs.getRepoState(settings.testprj))

20 changes: 10 additions & 10 deletions
tests/settings.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python3

from buildservice import BuildService
from os.path import expanduser
Expand DownExpand Up@@ -26,12 +26,12 @@

bs = BuildService(apiurl,oscrc)

print"**********************************"
print"Our test settings:"
print"API: "+apiurl
print"OSCRC: "+oscrc
print"Test project 1: "+testprj
print"Test project 2: "+testprj2
print"Test package: "+testpkg
print"Test file: "+testfile
print"**********************************"
print("**********************************")
print("Our test settings:")
print("API: "+apiurl)
print("OSCRC: "+oscrc)
print("Test project 1: "+testprj)
print("Test project 2: "+testprj2)
print("Test package: "+testpkg)
print("Test file: "+testfile)
print("**********************************")

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Changes for python3#7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

dsuni
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Changes for python3
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
buildservice/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,4 +18,4 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

from api import *
from .api import *

40 changes: 20 additions & 20 deletions
buildservice/api.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,12 +22,12 @@
import re
import tempfile
import time
import urllib2
import urllib.request
import cgi
import xml.etree.cElementTree as ElementTree
from urllib2 import HTTPError
from urllib.error import HTTPError
from osc import conf, core
from urllib import quote, quote_plus
from urllib.parse import quote, quote_plus

prj_template = """\
<project name="%(name)s">
Expand DownExpand Up@@ -114,10 +114,10 @@ def __init__(self, apiurl=None, oscrc=None):
 else:
 conf.get_config()

 except OSError, e:
 except OSError as e:
 if e.errno == 1:
 # permission problem, should be the chmod(0600) issue
 raise RuntimeError, 'Current user has no write permission for specified oscrc: %s' % oscrc
 raise RuntimeError('Current user has no write permission for specified oscrc: %s' % oscrc)

 raise # else

Expand All@@ -127,7 +127,7 @@ def __init__(self, apiurl=None, oscrc=None):
 self.apiurl = conf.config['apiurl']

 if not self.apiurl:
 raise RuntimeError, 'No apiurl "%s" found in %s' % (apiurl, oscrc)
 raise RuntimeError('No apiurl "%s" found in %s' % (apiurl, oscrc))

 # Add a couple of method aliases
 self.copyPackage = core.copy_pac
Expand DownExpand Up@@ -157,7 +157,7 @@ def isNewPackage(self, dst_project, dst_package):
 path_args = (core.quote_plus(dst_project), core.quote_plus(dst_package)),
 create_new = False,
 apiurl = self.apiurl)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 new_pkg = True
 else:
Expand DownExpand Up@@ -203,7 +203,7 @@ def createRequest(self, options_list, description, comment, supersede = False, *
 request.description = description
 request.state = core.RequestState(state)

supsersedereqs = []
supsersedereqs = []
 for item in options_list:
 if item['action'] == "submit":
 request.add_action(item['action'],
Expand All@@ -215,7 +215,7 @@ def createRequest(self, options_list, description, comment, supersede = False, *
 **kwargs)

 if supersede == True:
 supsersedereqs.extend(core.get_exact_request_list(self.apiurl, item['src_project'],
 supsersedereqs.extend(core.get_exact_request_list(self.apiurl, item['src_project'],
 item['tgt_project'], item['src_package'],
 item['tgt_package'], req_type='submit',
 req_state=['new','review', 'declined']))
Expand DownExpand Up@@ -272,7 +272,7 @@ def createRequest(self, options_list, description, comment, supersede = False, *
 for req in supsersedereqs:
 if req.reqid not in processed:
 processed.append(req.reqid)
 print"req.reqid: %s - new ID: %s\n"%(req.reqid, request.reqid)
 print("req.reqid: %s - new ID: %s\n"%(req.reqid, request.reqid))
 core.change_request_state(self.apiurl, req.reqid,
 'superseded',
 'superseded by %s' % request.reqid,
Expand DownExpand Up@@ -320,7 +320,7 @@ def get_source_file_content(apiurl, prj, pac, path, rev):
 path_args = (core.quote_plus(tgt_project), core.quote_plus(tgt_package)),
 create_new = False,
 apiurl = self.apiurl)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 new_pkg = True
 else:
Expand DownExpand Up@@ -371,7 +371,7 @@ def get_source_file_content(apiurl, prj, pac, path, rev):
 except UnicodeDecodeError:
 pass

 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 e.osc_msg = 'Diff not possible'

 # the result, in unicode string
Expand DownExpand Up@@ -541,7 +541,7 @@ def getProjectDiff(self, src_project, dst_project):
 diff = core.server_diff(self.apiurl,
 dst_project, src_package, None,
 src_project, src_package, None, False)
 printdiff
 print(diff)

 def getPackageList(self, prj, deleted=None):
 query = {}
Expand DownExpand Up@@ -699,7 +699,7 @@ def getSubmitRequests(self, req_state=None, start_time=None, end_time=None, proj

 submitrequests.sort(key=lambda x: x['id'])

return submitrequests
return submitrequests

 def rebuild(self, project, package, target=None, code=None):
 """
Expand DownExpand Up@@ -1004,7 +1004,7 @@ def hasChanges(self, oprj, opkg, orev, tprj, tpkg):
 """
 try:
 tsrcmd5 = self.getPackageChecksum(tprj, tpkg)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 return True
 else:
Expand DownExpand Up@@ -1329,7 +1329,7 @@ def createProject(self, name, repos, links=None, paths=None, build=True,
 )
 u = core.makeurl(self.apiurl, ['source', name, '_meta'])

 printmeta.encode('utf-8')
 print(meta.encode('utf-8'))
 f = core.http_PUT(u, data=meta)
 root = ElementTree.parse(f).getroot()
 ret = root.get('code')
Expand DownExpand Up@@ -1360,7 +1360,7 @@ def createProjectAttribute(self, project, attribute, package=None, namespace="OB
 xml = """
 <attributes><attribute namespace='%s' name='%s'>%s</attribute></attributes>
 """ % (namespace, attribute, values_xml)
 printxml
 print(xml)
 f = core.http_POST(u, data=xml)
 root = ElementTree.parse(f).getroot()
 ret = root.get('code')
Expand DownExpand Up@@ -1453,7 +1453,7 @@ def submit_action_diff(self, action):
 core.quote_plus(action.tgt_project),
 core.quote_plus(action.tgt_package)
 ))
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 if e.code == 404:
 new_pkg = True
 else:
Expand All@@ -1466,7 +1466,7 @@ def submit_action_diff(self, action):
 action.tgt_package, None, action.src_project,
 action.src_package, action.src_rev,
 unified=False, missingok=True)
 except urllib2.HTTPError, e:
 except urllib2.HTTPError as e:
 try:
 reason = core.ET.fromstring(e.read()).find("summary").text
 except Exception:
Expand DownExpand Up@@ -1724,5 +1724,5 @@ def save(self):
 for rulenode in rulenodes:
 flagnode.append(rulenode)

 printElementTree.tostring(self.tree)
 print(ElementTree.tostring(self.tree))


6 changes: 3 additions & 3 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/env python3
from setuptools import setup

version = open('VERSION').read().strip()
Expand All@@ -9,6 +9,6 @@
 description='Module to access OBS server',
 url='https://github.com/MeeGoIntegration/python-buildservice',
 packages=['buildservice'],
 install_requires=['osc<0.140'],
 python_requires='>=2.7,<3.0',
 install_requires=['osc'],
 python_requires='>=3.5',
)

12 changes: 6 additions & 6 deletions
tests/diff.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from osc import conf, core
import urllib2
import random

print"Diffing 10 random packages from "+settings.testprj+" and "+settings.testprj2
print("Diffing 10 random packages from "+settings.testprj+" and "+settings.testprj2)
packages = random.sample(settings.bs.getPackageList(settings.testprj),10)
for src_package in packages:
 print"Checking "+src_package
 print("Checking "+src_package)
 try:
 diff = core.server_diff(settings.bs.apiurl,
 settings.testprj, src_package, None,
 settings.testprj2, src_package, None, False)
 if not diff:
 print"No difference"
 print("No difference")
 else:
 printdiff
 print(diff)
 except urllib2.HTTPError as err:
 if err.code == 404:
 print"No "+src_package+" in "+settings.testprj2
 print("No "+src_package+" in "+settings.testprj2)
 else:
 raise

10 changes: 5 additions & 5 deletions
tests/get_build_results.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint

print'Checking project '+settings.testprj+':'
print('Checking project '+settings.testprj+':')
for repo in settings.bs.getProjectRepositories(settings.testprj):
 print' Checking repo '+repo+':'
 print' Archs:'
 print(' Checking repo '+repo+':')
 print(' Archs:')
 pprint(settings.bs.getRepositoryArchs(settings.testprj, repo))
 print' Results:'
 print(' Results:')
 pprint(settings.bs.getRepoResults(settings.testprj, repo))

6 changes: 3 additions & 3 deletions
tests/get_meta.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings

print'project meta of '+settings.testprj+':'
print('project meta of '+settings.testprj+':')
print(settings.bs.getProjectMeta(settings.testprj))

print'package meta of '+settings.testprj+'/'+settings.testpkg+':'
print('package meta of '+settings.testprj+'/'+settings.testpkg+':')
print(settings.bs.getPackageMeta(settings.testprj,settings.testpkg))

16 changes: 8 additions & 8 deletions
tests/get_packages.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint
import os

print'Checking package list of '+settings.testprj+':'
print('Checking package list of '+settings.testprj+':')
pprint(settings.bs.getPackageList(settings.testprj))

print'and targets :'
print('and targets :')
targets = settings.bs.getTargets(settings.testprj)
pprint(targets)

print'Checking status of '+settings.testprj+'/'+settings.testpkg+':'
print('Checking status of '+settings.testprj+'/'+settings.testpkg+':')
pprint(settings.bs.getPackageStatus(settings.testprj,settings.testpkg))

print'Checking file list of '+settings.testprj+'/'+settings.testpkg+':'
print('Checking file list of '+settings.testprj+'/'+settings.testpkg+':')
files = settings.bs.getPackageFileList(settings.testprj,settings.testpkg)
pprint(files)

print'Fetching file '+settings.testprj+'/'+settings.testpkg+'/'+settings.testfile+':'
print('Fetching file '+settings.testprj+'/'+settings.testpkg+'/'+settings.testfile+':')
print(settings.bs.getFile(settings.testprj,settings.testpkg,settings.testfile))

print'Checking binary list of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+':'
print('Checking binary list of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+':')
bins = settings.bs.getBinaryList(settings.testprj,targets[0],settings.testpkg)
pprint(bins)

print'Checking binary info of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+'/'+bins[2]+':'
print('Checking binary info of '+settings.testprj+'/'+settings.testpkg+'/'+targets[0]+'/'+bins[2]+':')
pprint(settings.bs.getBinaryInfo(settings.testprj,targets[0],settings.testpkg,bins[2]))

6 changes: 3 additions & 3 deletions
tests/get_prj_persons.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings

print'Bugowners of '+settings.testprj2
print('Bugowners of '+settings.testprj2)
print(settings.bs.getProjectPersons(settings.testprj2, 'bugowner'))
print'Maintainers of '+settings.testprj
print('Maintainers of '+settings.testprj)
print(settings.bs.getProjectPersons(settings.testprj, 'maintainer'))

18 changes: 9 additions & 9 deletions
tests/requests.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint

user = settings.bs.getUserName()
print'Your username seems to be '+user
print'Creating a request for deleting '+settings.testprj+'/'+settings.testpkg
print('Your username seems to be '+user)
print('Creating a request for deleting '+settings.testprj+'/'+settings.testpkg)
options=[{'action': 'delete','tgt_project': settings.testprj,'tgt_package': settings.testpkg}]
request = settings.bs.createRequest(options,'Description','Comment',True)
print'Adding a review to previous created request with ID: '+request.reqid
print('Adding a review to previous created request with ID: '+request.reqid)
if not settings.bs.addReview(request.reqid,"Message",user):
 print"Failed!"
 print("Failed!")
 exit()
print'Accepting the review'
print('Accepting the review')
if not settings.bs.setReviewState(request.reqid,"accepted","Message2",user):
 print"Failed!"
 print("Failed!")
 exit()
print'Revoking the request'
print('Revoking the request')
if not settings.bs.setRequestState(request.reqid,"revoked","Message3"):
 print"Failed!"
 print("Failed!")
 exit()

4 changes: 2 additions & 2 deletions
tests/results.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#!/usr/bin/python
#!/usr/bin/env python3

import settings
from pprint import pprint

print"Repository state of "+settings.testprj
print("Repository state of "+settings.testprj)
pprint(settings.bs.getRepoState(settings.testprj))

20 changes: 10 additions & 10 deletions
tests/settings.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python3

from buildservice import BuildService
from os.path import expanduser
Expand DownExpand Up@@ -26,12 +26,12 @@

bs = BuildService(apiurl,oscrc)

print"**********************************"
print"Our test settings:"
print"API: "+apiurl
print"OSCRC: "+oscrc
print"Test project 1: "+testprj
print"Test project 2: "+testprj2
print"Test package: "+testpkg
print"Test file: "+testfile
print"**********************************"
print("**********************************")
print("Our test settings:")
print("API: "+apiurl)
print("OSCRC: "+oscrc)
print("Test project 1: "+testprj)
print("Test project 2: "+testprj2)
print("Test package: "+testpkg)
print("Test file: "+testfile)
print("**********************************")