Skip to content

Updates for python3 #6

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
nledez wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updates for python3 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10853a4
Convert 'print foo' to 'print(foo)'
Apr 3, 2024
320b548
Fix ConfigParser import
Apr 3, 2024
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
89 changes: 46 additions & 43 deletions aptly_cli/api/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
import json
import requests
import os
from ConfigParser import ConfigParser
try:
from ConfigParser import ConfigParser
except ImportError:
from configparser import ConfigParser


class AptlyApiRequests(object):
Expand All @@ -33,7 +36,7 @@ def __init__(self):
else:
basic_url = 'http://localhost'
port = ':9003'
print "No Config file found, take default values"
print("No Config file found, take default values")

self.headers = {'content-type': 'application/json'}

Expand Down Expand Up @@ -63,7 +66,7 @@ def _out(arg_list):
Will give beautified output of a list.
"""
for y in arg_list:
print json.dumps(y, indent=2)
print(json.dumps(y, indent=2))

@staticmethod
def get_config_from_file():
Expand Down Expand Up @@ -129,7 +132,7 @@ def repo_create(self, repo_name, data=None):
headers=self.headers)
# r.raise_for_status()
resp_data = json.loads(r.content)
# print resp_data
# print(resp_data)
return resp_data

def repo_show(self, repo_name):
Expand All @@ -153,7 +156,7 @@ def repo_show(self, repo_name):
"""
r = requests.get(self.cfg['route_repo'] + repo_name, headers=self.headers)
resp_data = json.loads(r.content)
# print resp_data
# print(resp_data)
return resp_data

def repo_show_packages(self, repo_name, pkg_to_search=None, with_deps=0, detail='compact'):
Expand Down Expand Up @@ -187,7 +190,7 @@ def repo_show_packages(self, repo_name, pkg_to_search=None, with_deps=0, detail=
r = requests.get(url, params=param, headers=self.headers)
# raise_for_status()
resp_data = json.loads(r.content)
# print json.dumps(resp_data)
# print(json.dumps(resp_data))
return resp_data

def repo_edit(self, repo_name, data=None):
Expand Down Expand Up @@ -226,7 +229,7 @@ def repo_edit(self, repo_name, data=None):
headers=self.headers)
# r.raise_for_status()
resp_data = json.loads(r.content)
# print resp_data
# print(resp_data)
return resp_data

def repo_list(self):
Expand All @@ -241,7 +244,7 @@ def repo_list(self):
r = requests.get(self.cfg['route_repo'], headers=self.headers)
# r.raise_for_status()
resp_data = json.loads(r.content)
# print json.dumps(resp_data)
# print(json.dumps(resp_data))
return resp_data

def repo_delete(self, repo_name):
Expand All @@ -264,7 +267,7 @@ def repo_delete(self, repo_name):
headers=self.headers)
# r.raise_for_status()
resp_data = json.loads(r.content)
# print json.dumps(resp_data)
# print(json.dumps(resp_data))
return resp_data

def repo_add_package_from_upload(self, repo_name, dir_name, file_name=None, params=None):
Expand Down Expand Up @@ -319,7 +322,7 @@ def repo_add_package_from_upload(self, repo_name, dir_name, file_name=None, para
headers=self.headers)
# r.raise_for_status()
resp_data = json.loads(r.content)
# print resp_data
# print(resp_data)
return resp_data

def repo_add_packages_by_key(self, repo_name, package_key_list):
Expand Down Expand Up @@ -348,7 +351,7 @@ def repo_add_packages_by_key(self, repo_name, package_key_list):
http://localhost:8080/api/repos/repo2/packages
"""
if len(package_key_list) <= 0:
print 'No packages were given... aborting'
print('No packages were given... aborting')
return

url = self.cfg['route_repo'] + repo_name + '/packages'
Expand All @@ -357,7 +360,7 @@ def repo_add_packages_by_key(self, repo_name, package_key_list):
}
r = requests.post(url, data=json.dumps(param), headers=self.headers)
resp_data = json.loads(r.content)
# print resp_data
# print(resp_data)
return resp_data

def repo_delete_packages_by_key(self, repo_name, package_key_list):
Expand Down Expand Up @@ -386,7 +389,7 @@ def repo_delete_packages_by_key(self, repo_name, package_key_list):
}
r = requests.delete(url, data=json.dumps(data), headers=self.headers)
resp_data = json.loads(r.content)
# print resp_data
# print(resp_data)
return resp_data

###################
Expand All @@ -406,7 +409,7 @@ def file_list_directories(self):
r = requests.get(self.cfg['route_file'], headers=self.headers)
# r.raise_for_status()
resp_data = json.loads(r.content)
# print json.dumps(resp_data)
# print(json.dumps(resp_data))
return resp_data

def file_upload(self, dir_name, file_path):
Expand All @@ -431,7 +434,7 @@ def file_upload(self, dir_name, file_path):

# r.raise_for_status()
resp_data = json.loads(r.content)
# print resp_data
# print(resp_data)
return resp_data

def file_list(self, dir_name=None):
Expand All @@ -454,7 +457,7 @@ def file_list(self, dir_name=None):
dir_name, headers=self.headers)
# r.raise_for_status()
resp_data = json.loads(r.content)
# print json.dumps(resp_data)
# print(json.dumps(resp_data))
return resp_data

def file_delete_directory(self, dir_name):
Expand All @@ -470,7 +473,7 @@ def file_delete_directory(self, dir_name):
self.cfg['route_file'] + dir_name, headers=self.headers)
# r.raise_for_status()
resp_data = json.loads(r.content)
# print json.dumps(resp_data)
# print(json.dumps(resp_data))
return resp_data

def file_delete(self, dir_name, file_name):
Expand All @@ -486,7 +489,7 @@ def file_delete(self, dir_name, file_name):
self.cfg['route_file'] + dir_name + '/' + file_name, headers=self.headers)
# r.raise_for_status()
resp_data = json.loads(r.content)
# print json.dumps(resp_data)
# print(json.dumps(resp_data))
return resp_data

################
Expand Down Expand Up @@ -546,7 +549,7 @@ def snapshot_create_from_local_repo(self, snapshot_name, repo_name, description=
r = requests.post(url, data=json.dumps(data), headers=self.headers)
# r.raise_for_status()
resp_data = json.loads(r.content)
# print resp_data
# print(resp_data)
return resp_data

def snapshot_create_from_package_refs(self, snapshot_name, source_snapshot_list, package_refs_list, descr=None):
Expand Down Expand Up @@ -586,7 +589,7 @@ def snapshot_create_from_package_refs(self, snapshot_name, source_snapshot_list,

r = requests.post(url, data=json.dumps(data), headers=self.headers)
resp_data = json.loads(r.content)
# print resp_data
# print(resp_data)
return resp_data

def snapshot_update(self, old_snapshot_name, new_snapshot_name, description=None):
Expand Down Expand Up @@ -618,7 +621,7 @@ def snapshot_update(self, old_snapshot_name, new_snapshot_name, description=None

r = requests.put(url, data=json.dumps(data), headers=self.headers)
resp_data = json.loads(r.content)
# print resp_data
# print(resp_data)
return resp_data

def snapshot_show(self, snapshot_name):
Expand All @@ -637,7 +640,7 @@ def snapshot_show(self, snapshot_name):
url = self.cfg['route_snap'] + snapshot_name
r = requests.get(url, headers=self.headers)
resp_data = json.loads(r.content)
# print resp_data
# print(resp_data)
return resp_data

def snapshot_delete(self, snapshot_name, force='0'):
Expand All @@ -660,16 +663,16 @@ def snapshot_delete(self, snapshot_name, force='0'):
"""
url = self.cfg['route_snap'] + snapshot_name
if force == '1':
print 'Forcing removal of snapshot'
print('Forcing removal of snapshot')

param = {
'force': force
}

r = requests.delete(url, params=param, headers=self.headers)
print r.url
print(r.url)
resp_data = json.loads(r.content)
# print resp_data
# print(resp_data)
return resp_data

def snapshot_show_packages(self, snapshot_name, package_to_search=None, with_deps=0, detail='compact'):
Expand Down Expand Up @@ -704,7 +707,7 @@ def snapshot_show_packages(self, snapshot_name, package_to_search=None, with_dep

r = requests.get(url, params=param, headers=self.headers)
resp_data = json.loads(r.content)
# print resp_data
# print(resp_data)
return resp_data

def snapshot_diff(self, snapshot_left, snapshot_right):
Expand All @@ -729,7 +732,7 @@ def snapshot_diff(self, snapshot_left, snapshot_right):
snapshot_left + '/diff/' + snapshot_right
r = requests.get(url, headers=self.headers)
resp = json.loads(r.content)
# print resp
# print(resp)
return resp

###############
Expand All @@ -748,7 +751,7 @@ def publish_list(self):
url = self.cfg['route_pub']
r = requests.get(url, headers=self.headers)
resp = json.loads(r.content)
# print resp
# print(resp)
return resp

def publish(self, prefix, src_kind, src_list, dist, comp_list, label=None, orig=None, overwrite=None, arch_list=None):
Expand Down Expand Up @@ -796,7 +799,7 @@ def publish(self, prefix, src_kind, src_list, dist, comp_list, label=None, orig=
# Prepare list of sources
sources = []
if len(comp_list) != len(src_list):
print "ERROR: sources list and components list should have same length"
print("ERROR: sources list and components list should have same length")
return

for x in src_list:
Expand All @@ -812,19 +815,19 @@ def publish(self, prefix, src_kind, src_list, dist, comp_list, label=None, orig=
if orig is None:
if overwrite is None:
if arch_list is None:
print 'simple publish'
print('simple publish')
dat = {
'SourceKind': src_kind,
'Sources': sources,
'Distribution': dist
}
else:
print 'multi publish'
print('multi publish')
if int(overwrite) <= 0:
fo = False
else:
fo = True
print fo
print(fo)
dat = {
'SourceKind': src_kind,
'Sources': sources,
Expand All @@ -835,11 +838,11 @@ def publish(self, prefix, src_kind, src_list, dist, comp_list, label=None, orig=
'ForceOverwrite': fo
}

# print dat
# print(dat)
r = requests.post(url, data=json.dumps(dat), headers=self.headers)
# print r.url
# print(r.url)
resp = json.loads(r.content)
# print resp
# print(resp)
return resp

def publish_switch(self, prefix, snapshot_list, dist, component=None, force_overwrite=0):
Expand Down Expand Up @@ -872,7 +875,7 @@ def publish_switch(self, prefix, snapshot_list, dist, component=None, force_over
is_array = isinstance(snapshot_list, list)

if not is_array:
print "convert snapshot param to array.. "
print("convert snapshot param to array.. ")
tmp_val = snapshot_list
snapshot_list = tmp_val.split(', ')

Expand All @@ -887,14 +890,14 @@ def publish_switch(self, prefix, snapshot_list, dist, component=None, force_over
'Name': x
}
snap_list_obj.append(snap_obj)
print snap_list_obj
print(snap_list_obj)
data = {
'Snapshots': snap_list_obj,
'ForceOverwrite': fo
}
r = requests.put(url, data=json.dumps(data), headers=self.headers)
resp = json.loads(r.content)
# print resp
# print(resp)
return resp

def publish_drop(self, prefix, distribution, force=0):
Expand All @@ -921,7 +924,7 @@ def publish_drop(self, prefix, distribution, force=0):

r = requests.delete(url, params=param, headers=self.headers)
resp = json.loads(r.content)
# print resp
# print(resp)
return resp

###############
Expand Down Expand Up @@ -953,7 +956,7 @@ def package_show_by_key(self, package_key):
url = self.cfg['route_pack'] + package_key
r = requests.get(url, headers=self.headers)
resp = json.loads(r.content)
# print resp
# print(resp)
return resp

#############
Expand All @@ -970,10 +973,10 @@ def graph(self, file_ext='.png'):
open url http://localhost:8080/api/graph.svg in browser (hint: aptly database should be non-empty)
"""
url = self.cfg['route_graph'][:-1] + file_ext
print url
print(url)
r = requests.get(url, headers=self.headers)
resp = json.loads(r.content)
# print resp
# print(resp)
return resp

###############
Expand All @@ -991,5 +994,5 @@ def get_version(self):
url = self.cfg['route_vers']
r = requests.get(url, headers=self.headers)
resp = json.loads(r.content)
# print resp
# print(resp)
return resp
Loading