Skip to content

Making compatible with python3 #1

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
cjam wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Making compatible with python3 #1

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
42 changes: 21 additions & 21 deletions pyONC/webservices/oncws.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ class ServiceMethod(object):
"""
def __init__(self, **kwargs):
if verbose:
print "ServiceMethod.__init__"
print kwargs
print("ServiceMethod.__init__")
print(kwargs)
self.decorator_kwargs = kwargs

def __call__(self, f):
if verbose:
print "ServiceMethod.__call__"
print f.__name__
print("ServiceMethod.__call__")
print(f.__name__)

@wraps(f)
def wrapped_f(ServiceObj,**kwargs):
Expand Down Expand Up @@ -92,25 +92,25 @@ def wrapped_f(ServiceObj,**kwargs):
params['token'] = ServiceObj.token

if verbose:
print URL
print params
print(URL)
print(params)
if returnFormat == 'url':
# Simply return the URL that would be called
return URL + '?' + urllib.urlencode(params)

r=requests.get(URL, params=params)
if not r.ok:
try:
print '%d: %s' % (r.status_code, status_msgs[r.status_code])
print('%d: %s' % (r.status_code, status_msgs[r.status_code]))
except:
print '%d is not an expected status code...' % r.status_code
print('%d is not an expected status code...' % r.status_code)
if verbose:
print r
print "%s.%s wrapped" % (ServiceObj.__class__, f.__name__)
print self.decorator_kwargs
print r.url
print ServiceObj.baseURL,ServiceObj.servicename, f.__name__,kwargs
print kwargs
print(r)
print("%s.%s wrapped" % (ServiceObj.__class__, f.__name__))
print(self.decorator_kwargs)
print(r.url)
print(ServiceObj.baseURL,ServiceObj.servicename, f.__name__,kwargs)
print(kwargs)

if returnFormat == 'json':
#if (f.__name__=='getFile' and ServiceObj.servicename == 'archivefiles'):
Expand All @@ -131,7 +131,7 @@ class _ExposedResource(object):
"""Abstract base object with common properties inheritet by webservice resources"""
def __init__(self,baseURL=baseURL,token=None,returnFormat=None):
if verbose:
print "Abstract init!!!"
print("Abstract init!!!")
if returnFormat:
self.returnFormat=returnFormat.lower()
else:
Expand All @@ -146,7 +146,7 @@ def __init__(self,baseURL=baseURL,token=None,returnFormat=None):
def getToken(self):
"""If the user access token is unkown help user to find it"""
#webbrowser('https://dmas.uvic.ca/Profile')
#print "Enter token:"
#print("Enter token:")
self.token=token


Expand Down Expand Up @@ -243,19 +243,19 @@ def printTree(self,showHidden="false"):
nodeTree=self.getTree(showHidden=showHidden,returnFormat='json')
for observatoryRoot in nodeTree:
self._printNode(observatoryRoot)
print " "
print(" ")

def _printNode(self,node,path=''):
#print "Node: ", node
#print("Node: ", node)
for key in ['name', 'stationCode', 'description', 'deviceCategories', 'els']:
if not node.has_key(key):
#print 'missing key: %s !!!!' % key
#print('missing key: %s !!!!' % key)
node[key]=None
path += '%s/' % node['name']
#deviceCategories=node['deviceCategories'].sort()
#print '%s\t%s\t%s\t%s' % (path, node['name'], node['stationCode'],', '.join(node['deviceCategories']))
#print('%s\t%s\t%s\t%s' % (path, node['name'], node['stationCode'],', '.join(node['deviceCategories'])))
#if 'JB' in node['deviceCategories']:
print path,', '.join(node['deviceCategories'])
print(path,', '.join(node['deviceCategories']))
childNodes=node['els'] #.sort(key='desciption')
for childNode in childNodes:
self._printNode(childNode,path=path)
Expand Down
3 changes: 1 addition & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@
from setuptools import setup #, find_packages

setup(name='pyONC',
version='0.1.0',
version='0.1.1',
description='Python tools for Ocean Networks Canada data access',
url='https://github.com/MHee/pyONC',
author='Martin Heesemann',
author_email='mheesema@uvic.ca',
license='MIT',
packages=['pyONC','pyONC.webservices'],
zip_safe=False)
#print find_packages()