2021-12-15 Fred Gleason <fredg@paravelsystems.com>

* Renamed the 'rivwebpyapi.rivwebpyapi()' class to
	'rivwebpyapi.Site()'.
	* Added 'make pypi' and 'make post-pypi' targets to
	'apis/rivwebpyapi/Makefile.am'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>

apis/rivwebpyapi/Makefile.am

@@ -23,14 +23,30 @@
 SUBDIRS = api\
           tests
 
+pypi:	
+	rm -rf pypi
+	../../helpers/build_pypi_package.sh rivwebpyapi
+	cp pypi/dist/* .
+	rm -rf pypi
+
+post-pypi:	
+	python3 -m twine upload --repository testpypi *.tar.gz *.whl
+
+EXTRA_DIST = pyproject.toml\
+             setup.cfg.in
+
 CLEANFILES = *~\
              *.idb\
              *ilk\
              *.obj\
              *.pdb\
              *.qm\
+             *.tar.gz\
+             *.whl\
              moc_*
 
+DISTCLEANFILES = setup.cfg
+
 MAINTAINERCLEANFILES = *~\
                        *.tar.gz\
                        aclocal.m4\

apis/rivwebpyapi/api/Makefile.am

@@ -20,7 +20,7 @@
 ##
 ## Use automake to process this into a Makefile.in
 
-rivendelldir = $(pyexecdir)
+rivendelldir = $(pyexecdir)/rivwebpyapi
 rivendell_PYTHON = rivwebpyapi.py
 
 CLEANFILES = *~\

apis/rivwebpyapi/api/rivwebpyapi.py

@@ -479,7 +479,7 @@ class SystemSettings(RivendellType):
     def __init__(self,values={}):
         super().__init__(SYSTEM_SETTINGS_FIELDS,values)
 
-class rivwebpyapi(object):
+class Site(object):
     """
        Create a 'RivWebPyApi' object for accessing the Web API.
     """

apis/rivwebpyapi/pyproject.toml

@@ -0,0 +1,6 @@
+[build-system]
+requires=[
+	"setuptools>=42",
+	"wheel"
+]
+build-backend="setuptools.build_meta"

apis/rivwebpyapi/setup.cfg.in

@@ -0,0 +1,24 @@
+[metadata]
+name=rivwebpyapi
+version=@RIVWEBPYAPI_VERSION@
+author=Fred Gleason
+author_email=fredg@paravelsystems.com
+description=Python 3 interface for accessing the Rivendell Web API
+long_description=str: This is a Python 3 language binding for the Rivendell Web API.
+long_description_content_type=text/markdown
+url=https://github.com/ElvishArtisan/rivendell
+project_urls=
+	Bug Tracker=https://github.com/ElvishArtisan/rivendell/issues
+classifiers=
+	Programming Language :: Python :: 3
+	License :: OSI Approved :: GNU Lesser General Public License v2 (LGPLv2)
+	Operating System :: OS Independent
+
+[options]
+package_dir=
+	=src
+packages=find:
+python_requires = >=3.6
+
+[options.packages.find]
+where=src

apis/rivwebpyapi/tests/add_cart.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -73,9 +75,9 @@ if(cart_number==0):
 #
 # Get the cut list
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    cart=webapi.AddCart(group_name=group_name,cart_type=cart_type,cart_number=cart_number)
+    cart=site.AddCart(group_name=group_name,cart_type=cart_type,cart_number=cart_number)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/add_cut.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -62,9 +64,9 @@ if(not cart_number):
 #
 # Get the cut list
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    cut=webapi.AddCut(cart_number=cart_number)
+    cut=site.AddCut(cart_number=cart_number)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/add_log.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -67,9 +69,9 @@ if(not service_name):
 #
 # Execute
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    webapi.AddLog(service_name=service_name,log_name=log_name)
+    site.AddLog(service_name=service_name,log_name=log_name)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/assign_sched_code.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -67,9 +69,9 @@ if(not sched_code):
 #
 # Execute
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    webapi.AssignSchedCode(cart_number=cart_number,sched_code=sched_code)
+    site.AssignSchedCode(cart_number=cart_number,sched_code=sched_code)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/audio_info.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -67,9 +69,9 @@ if(cut_number==0):
 #
 # Get the code list
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    info=webapi.AudioInfo(cart_number=cart_number,cut_number=cut_number)
+    info=site.AudioInfo(cart_number=cart_number,cut_number=cut_number)
 except rivwebpyapi.RivWebPyError as err:
     print('*** ERROR ***')
     print('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/audio_store.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -55,9 +57,9 @@ if((not url)or(not username)):
 #
 # Get the settings
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    setting=webapi.AudioStore()
+    setting=site.AudioStore()
 except rivwebpyapi.RivWebPyError as err:
     print('*** ERROR ***')
     print('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/delete_audio.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -67,9 +69,9 @@ if(cut_number==0):
 #
 # Get the code list
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    webapi.DeleteAudio(cart_number=cart_number,cut_number=cut_number)
+    site.DeleteAudio(cart_number=cart_number,cut_number=cut_number)
 except rivwebpyapi.RivWebPyError as err:
     print('*** ERROR ***')
     print('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/delete_log.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -61,9 +63,9 @@ if(not log_name):
 #
 # Execute
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    webapi.DeleteLog(log_name=log_name)
+    site.DeleteLog(log_name=log_name)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/edit_cart.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -70,12 +72,12 @@ if(cart_number==0):
 #
 # Get the cart list
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 cart=rivwebpyapi.Cart()
 cart.setValues(values)
 
 try:
-    cart=webapi.EditCart(cart_number=cart_number,values=cart.values())
+    cart=site.EditCart(cart_number=cart_number,values=cart.values())
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/edit_cut.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -76,12 +78,12 @@ if(cut_number==0):
 #
 # Execute
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 cut=rivwebpyapi.Cut()
 cut.setValues(values)
 
 try:
-    cut=webapi.EditCut(cart_number=cart_number,cut_number=cut_number,
+    cut=site.EditCut(cart_number=cart_number,cut_number=cut_number,
                        values=cut.values())
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')

apis/rivwebpyapi/tests/export.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -110,9 +112,9 @@ if(end_point<0):
 #
 # Get the code list
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    webapi.Export(filename=filename,cart_number=cart_number,
+    site.Export(filename=filename,cart_number=cart_number,
                   cut_number=cut_number,
                   audio_format=audio_format,channels=channels,
                   sample_rate=sample_rate,bit_rate=bit_rate,quality=quality,

apis/rivwebpyapi/tests/export_peaks.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -67,9 +69,9 @@ if(cut_number==0):
 #
 # Get the peak data
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    peak_data=webapi.ExportPeaks(cart_number=cart_number,cut_number=cut_number)
+    peak_data=site.ExportPeaks(cart_number=cart_number,cut_number=cut_number)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/get_podcast.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -67,9 +69,9 @@ if(not filename):
 #
 # Execute
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    webapi.GetPodcast(cast_id=cast_id,filename=filename)
+    site.GetPodcast(cast_id=cast_id,filename=filename)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/import.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -92,9 +94,9 @@ if(not filename):
 #
 # Get the code list
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    result=webapi.Import(filename=filename,cart_number=cart_number,
+    result=site.Import(filename=filename,cart_number=cart_number,
                          cut_number=cut_number,channels=channels,
                          normalization_level=normalization_level,
                          autotrim_level=autotrim_level,

apis/rivwebpyapi/tests/list_cart.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -62,9 +64,9 @@ if(cart_number==0):
 #
 # Get the cart list
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    cart=webapi.ListCart(cart_number=cart_number,include_cuts=include_cuts)
+    cart=site.ListCart(cart_number=cart_number,include_cuts=include_cuts)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/list_cart_sched_codes.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -62,9 +64,9 @@ if(cart_number==0):
 #
 # Get the code list
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    codes=webapi.ListCartSchedCodes(cart_number=cart_number)
+    codes=site.ListCartSchedCodes(cart_number=cart_number)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/list_carts.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -69,10 +71,10 @@ if((not url)or(not username)):
 #
 # Get the cart list
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    carts=webapi.ListCarts(group_name=group_name,filter_string=filter_string,
-                           cart_type=cart_type,include_cuts=include_cuts)
+    carts=site.ListCarts(group_name=group_name,filter_string=filter_string,
+                         cart_type=cart_type,include_cuts=include_cuts)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/list_cut.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -68,9 +70,9 @@ if(cut_number==0):
 #
 # Get the cut list
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    cut=webapi.ListCut(cart_number=cart_number,cut_number=cut_number)
+    cut=site.ListCut(cart_number=cart_number,cut_number=cut_number)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/list_cuts.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -62,9 +64,9 @@ if(cart_number==0):
 #
 # Get the cut list
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    cuts=webapi.ListCuts(cart_number=cart_number)
+    cuts=site.ListCuts(cart_number=cart_number)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/list_group.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -59,9 +61,9 @@ if(not group_name):
 #
 # Get the group list
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    grp=webapi.ListGroup(group_name=group_name)
+    grp=site.ListGroup(group_name=group_name)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/list_groups.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -54,9 +56,9 @@ if((not url)or(not username)):
 #
 # Get the group list
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    groups=webapi.ListGroups()
+    groups=site.ListGroups()
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/list_log.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -64,9 +66,9 @@ if(not log_name):
 #
 # Get the log list
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    loglines=webapi.ListLog(log_name=log_name)
+    loglines=site.ListLog(log_name=log_name)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/list_logs.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -70,9 +72,9 @@ if((not url)or(not username)):
 #
 # Get the log list
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    logs=webapi.ListLogs(service_name=service_name,log_name=log_name,
+    logs=site.ListLogs(service_name=service_name,log_name=log_name,
                          trackable=trackable,filter_string=filter_string,
                          recent=recent)
 except rivwebpyapi.RivWebPyError as err:

apis/rivwebpyapi/tests/list_scheduler_codes.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -57,9 +59,9 @@ if((not url)or(not username)):
 #
 # Get the code list
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    codes=webapi.ListSchedulerCodes()
+    codes=site.ListSchedulerCodes()
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/list_services.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -57,9 +59,9 @@ if((not url)or(not username)):
 #
 # Get the services list
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    services=webapi.ListServices(trackable=trackable)
+    services=site.ListServices(trackable=trackable)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/list_system_settings.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -57,9 +59,9 @@ if((not url)or(not username)):
 #
 # Get the code list
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    settings=webapi.ListSystemSettings()
+    settings=site.ListSystemSettings()
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/lock_log.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -76,9 +78,9 @@ if((operation!='CREATE')and(not guid)):
 #
 # Execute
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    lock=webapi.LockLog(log_name=log_name,operation=operation,guid=guid)
+    lock=site.LockLog(log_name=log_name,operation=operation,guid=guid)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/post_image.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -61,9 +63,9 @@ if(image_id<0):
 #
 # Execute
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    webapi.PostImage(image_id=image_id)
+    site.PostImage(image_id=image_id)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/post_podcast.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -61,9 +63,9 @@ if(cast_id<0):
 #
 # Execute
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    webapi.PostPodcast(cast_id=cast_id)
+    site.PostPodcast(cast_id=cast_id)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/post_rss.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -61,9 +63,9 @@ if(feed_id<0):
 #
 # Execute
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    webapi.PostRss(feed_id=feed_id)
+    site.PostRss(feed_id=feed_id)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/rehash.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -67,9 +69,9 @@ if(cut_number==0):
 #
 # Execute
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    webapi.Rehash(cart_number=cart_number,cut_number=cut_number)
+    site.Rehash(cart_number=cart_number,cut_number=cut_number)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/remove_cart.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -61,9 +63,9 @@ if(cart_number==0):
 #
 # Execute
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    webapi.RemoveCart(cart_number=cart_number)
+    site.RemoveCart(cart_number=cart_number)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/remove_cut.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -67,9 +69,9 @@ if(cut_number==0):
 #
 # Execute
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    webapi.RemoveCut(cart_number=cart_number,cut_number=cut_number)
+    site.RemoveCut(cart_number=cart_number,cut_number=cut_number)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/remove_image.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -61,9 +63,9 @@ if(image_id<0):
 #
 # Execute
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    webapi.RemoveImage(image_id=image_id)
+    site.RemoveImage(image_id=image_id)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/remove_podcast.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -61,9 +63,9 @@ if(cast_id<0):
 #
 # Execute
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    webapi.RemovePodcast(cast_id=cast_id)
+    site.RemovePodcast(cast_id=cast_id)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/remove_rss.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -61,9 +63,9 @@ if(feed_id<0):
 #
 # Execute
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    webapi.RemoveRss(feed_id=feed_id)
+    site.RemoveRss(feed_id=feed_id)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/save_log.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -70,13 +72,13 @@ if(from_log_name==to_log_name):
     eprint('"--from-log-name" and "--to-log_name" must be different')
     sys.exit(1)
 
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 
 #
 # Get the "from" log
 #
 try:
-    log_header=webapi.ListLogs(log_name=from_log_name)[0]
+    log_header=site.ListLogs(log_name=from_log_name)[0]
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR Calling ListLogs() ***')
     eprint('Response Code: '+str(err.responseCode))
@@ -86,7 +88,7 @@ except rivwebpyapi.RivWebPyError as err:
     sys.exit(1)
 
 try:
-    log_lines=webapi.ListLog(log_name=from_log_name)
+    log_lines=site.ListLog(log_name=from_log_name)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR Calling ListLog() ***')
     eprint('Response Code: '+str(err.responseCode))
@@ -99,7 +101,7 @@ except rivwebpyapi.RivWebPyError as err:
 # Save "to" log
 #
 try:
-    webapi.SaveLog(log_name=to_log_name,header_values=log_header,line_values=log_lines)
+    site.SaveLog(log_name=to_log_name,header_values=log_header,line_values=log_lines)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR Calling SaveLog() ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/save_podcast.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -67,9 +69,9 @@ if(not filename):
 #
 # Execute
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    webapi.SavePodcast(cast_id=cast_id,filename=filename)
+    site.SavePodcast(cast_id=cast_id,filename=filename)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))

apis/rivwebpyapi/tests/trim_audio.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -73,9 +75,9 @@ if(trim_level==1700):
 #
 # Execute
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    result=webapi.TrimAudio(cart_number=cart_number,cut_number=cut_number,
+    result=site.TrimAudio(cart_number=cart_number,cut_number=cut_number,
                             trim_level=trim_level)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')

apis/rivwebpyapi/tests/unassign_sched_code.py

@@ -23,8 +23,10 @@
 #
 
 import getpass
-import rivwebpyapi
 import sys
+
+from rivwebpyapi import rivwebpyapi
+
 def eprint(*args,**kwargs):
     print(*args,file=sys.stderr,**kwargs)
 
@@ -67,9 +69,9 @@ if(not sched_code):
 #
 # Execute
 #
-webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+site=rivwebpyapi.Site(url=url,username=username,password=password)
 try:
-    webapi.UnassignSchedCode(cart_number=cart_number,sched_code=sched_code)
+    site.UnassignSchedCode(cart_number=cart_number,sched_code=sched_code)
 except rivwebpyapi.RivWebPyError as err:
     eprint('*** ERROR ***')
     eprint('Response Code: '+str(err.responseCode))