Use pmGetNonOptionsFromList instead of deprecated pmNonOptionsFromList

[Marko Myllynen <myllynen@xxxxxxxxxx>]

Use pmGetNonOptionsFromList instead of deprecated pmNonOptionsFromList

---
 qa/968                           | 2 +-
 qa/src/procpid.python            | 2 +-
 qa/src/test_pcp_getopts.python   | 2 +-
 qa/src/test_pcp_options.python   | 2 +-
 src/pcp/dmcache/pcp-dmcache.py   | 2 +-
 src/pcp2graphite/pcp2graphite.py | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/qa/968 b/qa/968
index b373732..0f9ccc7 100755
--- a/qa/968
+++ b/qa/968
@@ -20,7 +20,7 @@ cat > $tmp.opts <<EOF
 from pcp import pmapi
 import sys
 opts = pmapi.pmOptions()
-nops = opts.pmNonOptionsFromList(sys.argv)
+nops = opts.pmGetNonOptionsFromList(sys.argv)
 ctx = pmapi.pmContext.fromOptions(opts, sys.argv)
 EOF
 cat $tmp.opts >> $seq.full
diff --git a/qa/src/procpid.python b/qa/src/procpid.python
index f303611..bf1ad81 100755
--- a/qa/src/procpid.python
+++ b/qa/src/procpid.python
@@ -55,7 +55,7 @@ if __name__ == '__main__':
             origin = options.pmGetOptionOrigin()
             manager.pmSetMode(PM_MODE_FORW, origin, 0)
         manager.printer = ProcReport()
-        METRICS = options.pmNonOptionsFromList(sys.argv)
+        METRICS = options.pmGetNonOptionsFromList(sys.argv)
         if METRICS == None:
             raise pmapi.pmUsageErr()
         manager['proc'] = METRICS
diff --git a/qa/src/test_pcp_getopts.python b/qa/src/test_pcp_getopts.python
index bb5481b..fa20fca 100755
--- a/qa/src/test_pcp_getopts.python
+++ b/qa/src/test_pcp_getopts.python
@@ -56,7 +56,7 @@ except pmapi.pmUsageErr as usage:
 except pmapi.pmErr as error:
     print(error)
 
-nonoptions = options.pmNonOptionsFromList(system.argv)
+nonoptions = options.pmGetNonOptionsFromList(system.argv)
 if nonoptions != None:
     print("Non-option arguments: %s" % nonoptions)
 
diff --git a/qa/src/test_pcp_options.python b/qa/src/test_pcp_options.python
index 45f69d8..e378858 100755
--- a/qa/src/test_pcp_options.python
+++ b/qa/src/test_pcp_options.python
@@ -90,7 +90,7 @@ interval = options.pmGetOptionInterval()
 if interval != None:
     print("Interval: %s" % interval)
 
-nonoptions = options.pmNonOptionsFromList(system.argv)
+nonoptions = options.pmGetNonOptionsFromList(system.argv)
 if nonoptions != None:
     print("Non-option arguments: %s" % nonoptions)
 
diff --git a/src/pcp/dmcache/pcp-dmcache.py b/src/pcp/dmcache/pcp-dmcache.py
index 1760fbf..6bc9801 100755
--- a/src/pcp/dmcache/pcp-dmcache.py
+++ b/src/pcp/dmcache/pcp-dmcache.py
@@ -146,7 +146,7 @@ if __name__ == '__main__':
         options.pmSetLongOptionVersion()
         options.pmSetLongOptionHelp()
         manager = pmcc.MetricGroupManager.builder(options, sys.argv)
-        manager.printer = 
DmCachePrinter(options.pmNonOptionsFromList(sys.argv))
+        manager.printer = 
DmCachePrinter(options.pmGetNonOptionsFromList(sys.argv))
         manager['dmcache'] = CACHE_METRICS
         manager.run()
     except pmapi.pmErr as error:
diff --git a/src/pcp2graphite/pcp2graphite.py b/src/pcp2graphite/pcp2graphite.py
index 413fd5c..fcbffcc 100644
--- a/src/pcp2graphite/pcp2graphite.py
+++ b/src/pcp2graphite/pcp2graphite.py
@@ -99,7 +99,7 @@ network.""")
         self.metrics = []
         self.pmids = []
         self.descs = []
-        metrics = self.opts.pmNonOptionsFromList(sys.argv)
+        metrics = self.opts.pmGetNonOptionsFromList(sys.argv)
         if metrics:
             for m in metrics:
                 try:

Thanks,

-- 
Marko Myllynen