From d1e7a25931f73d5acf41d89580355d29f1e7d977 Mon Sep 17 00:00:00 2001 From: elie Date: Fri, 14 Oct 2005 16:13:31 +0000 Subject: prettyOut() -> prettyPrint() --- examples/v1arch/manager/setgen.py | 4 ++-- examples/v3arch/manager/bulkgen.py | 6 +++--- examples/v3arch/manager/getgen.py | 4 ++-- examples/v3arch/manager/nextgen.py | 6 +++--- examples/v3arch/manager/ntfrcv.py | 2 +- examples/v3arch/manager/setgen.py | 4 ++-- examples/v3arch/oneliner/manager/bulkgen.py | 4 ++-- examples/v3arch/oneliner/manager/getgen.py | 4 ++-- examples/v3arch/oneliner/manager/nextgen.py | 4 ++-- examples/v3arch/oneliner/manager/setgen.py | 4 ++-- examples/v3arch/oneliner/manager/withmib/nextgen.py | 6 +++--- examples/v3arch/oneliner/manager/withmib/setgen.py | 6 +++--- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/examples/v1arch/manager/setgen.py b/examples/v1arch/manager/setgen.py index 4cb1aa2..f6eb053 100644 --- a/examples/v1arch/manager/setgen.py +++ b/examples/v1arch/manager/setgen.py @@ -38,10 +38,10 @@ def cbRecvFun(transportDispatcher, transportDomain, transportAddress, # Check for SNMP errors reported errorStatus = pMod.apiPDU.getErrorStatus(rspPDU) if errorStatus: - print errorStatus.prettyOut(errorStatus) + print errorStatus.prettyPrint() else: for oid, val in pMod.apiPDU.getVarBinds(rspPDU): - print oid, val.prettyOut(val) + print oid.prettyPrint(), val.prettyPrint() transportDispatcher.jobFinished(1) return wholeMsg diff --git a/examples/v3arch/manager/bulkgen.py b/examples/v3arch/manager/bulkgen.py index e87b2dc..1e2a4fe 100644 --- a/examples/v3arch/manager/bulkgen.py +++ b/examples/v3arch/manager/bulkgen.py @@ -37,14 +37,14 @@ def cbFun(sendRequesthandle, errorIndication, errorStatus, errorIndex, print errorIndication return if errorStatus: - print errorStatus.prettyOut(errorStatus) + print errorStatus.prettyPrint() return for varBindRow in varBindTable: for oid, val in varBindRow: if val is None: - print oid + print oid.prettyPrint() else: - print '%s = %s' % (oid, val.prettyOut(val)) + print '%s=%s' % (oid.prettyPrint(), val.prettyPrint()) for oid, val in varBindTable[-1]: if val is not None: break diff --git a/examples/v3arch/manager/getgen.py b/examples/v3arch/manager/getgen.py index d60e80b..51da752 100644 --- a/examples/v3arch/manager/getgen.py +++ b/examples/v3arch/manager/getgen.py @@ -49,7 +49,7 @@ snmpEngine.transportDispatcher.runDispatcher() if cbCtx['errorIndication']: print cbCtx['errorIndication'] elif cbCtx['errorStatus']: - print cbCtx['errorStatus'].prettyOut(cbCtx['errorStatus']) + print cbCtx['errorStatus'].prettyPrint() else: for oid, val in cbCtx['varBinds']: - print '%s = %s' % (oid, val.prettyOut(val)) + print '%s=%s' % (oid.prettyPrint(), val.prettyPrint()) diff --git a/examples/v3arch/manager/nextgen.py b/examples/v3arch/manager/nextgen.py index 497438c..c729f5d 100644 --- a/examples/v3arch/manager/nextgen.py +++ b/examples/v3arch/manager/nextgen.py @@ -37,14 +37,14 @@ def cbFun(sendRequestHandle, errorIndication, errorStatus, errorIndex, print errorIndication return if errorStatus: - print errorStatus.prettyOut(errorStatus) + print errorStatus.prettyPrint() return for varBindRow in varBindTable: for oid, val in varBindRow: if val is None: - print oid + print oid.prettyPrint() else: - print '%s = %s' % (oid, val.prettyOut(val)) + print '%s = %s' % (oid.prettyPrint(), val.prettyPrint()) for oid, val in varBindTable[-1]: if val is not None: break diff --git a/examples/v3arch/manager/ntfrcv.py b/examples/v3arch/manager/ntfrcv.py index 8bf247d..47c37da 100644 --- a/examples/v3arch/manager/ntfrcv.py +++ b/examples/v3arch/manager/ntfrcv.py @@ -34,7 +34,7 @@ def cbFun(snmpEngine, contextEngineId, contextName ) for name, val in varBinds: - print '%s=%s' % (name, val.prettyOut(val)) + print '%s=%s' % (name.prettyPrint(), val.prettyPrint()) # Apps registration ntfrcv.NotificationReceiver(snmpEngine, cbFun) diff --git a/examples/v3arch/manager/setgen.py b/examples/v3arch/manager/setgen.py index 30b022b..2c8a833 100644 --- a/examples/v3arch/manager/setgen.py +++ b/examples/v3arch/manager/setgen.py @@ -51,9 +51,9 @@ if cbCtx['errorIndication']: print cbCtx['errorIndication'] elif cbCtx['errorStatus']: print '%s at %s' % ( - cbCtx['errorStatus'].prettyOut(cbCtx['errorStatus']), + cbCtx['errorStatus'].prettyPrint(), cbCtx['varBinds'][int(cbCtx['errorIndex'])-1] ) else: for o, v in cbCtx['varBinds']: - print '%s = %s' % (o, v.prettyOut(v)) + print '%s = %s' % (o.prettyPrint(), v.prettyPrint()) diff --git a/examples/v3arch/oneliner/manager/bulkgen.py b/examples/v3arch/oneliner/manager/bulkgen.py index b2d23f6..a672af9 100644 --- a/examples/v3arch/oneliner/manager/bulkgen.py +++ b/examples/v3arch/oneliner/manager/bulkgen.py @@ -18,10 +18,10 @@ if errorIndication: else: if errorStatus: print '%s at %s\n' % ( - errorStatus.prettyOut(errorStatus), + errorStatus.prettyPrint(), varBindTable[-1][int(errorIndex)-1] ) else: for varBindTableRow in varBindTable: for name, val in varBindTableRow: - print '%s = %s' % (name, val.prettyOut(val)) + print '%s = %s' % (name.prettyPrint(), val.prettyPrint()) diff --git a/examples/v3arch/oneliner/manager/getgen.py b/examples/v3arch/oneliner/manager/getgen.py index 37b4862..d06fe7b 100644 --- a/examples/v3arch/oneliner/manager/getgen.py +++ b/examples/v3arch/oneliner/manager/getgen.py @@ -17,8 +17,8 @@ if errorIndication: else: if errorStatus: print '%s at %s\n' % ( - errorStatus.prettyOut(errorStatus), varBinds[int(errorIndex)-1] + errorStatus.prettyPrint(), varBinds[int(errorIndex)-1] ) else: for name, val in varBinds: - print '%s = %s' % (name, val.prettyOut(val)) + print '%s = %s' % (name.prettyPrint(), val.prettyPrint()) diff --git a/examples/v3arch/oneliner/manager/nextgen.py b/examples/v3arch/oneliner/manager/nextgen.py index 613a869..3c246f4 100644 --- a/examples/v3arch/oneliner/manager/nextgen.py +++ b/examples/v3arch/oneliner/manager/nextgen.py @@ -17,10 +17,10 @@ if errorIndication: else: if errorStatus: print '%s at %s\n' % ( - errorStatus.prettyOut(errorStatus), + errorStatus.prettyPrint(), varBindTable[-1][int(errorIndex)-1] ) else: for varBindTableRow in varBindTable: for name, val in varBindTableRow: - print '%s = %s' % (name, val.prettyOut(val)) + print '%s=%s' % (name.prettyPrint(), val.prettyPrint()) diff --git a/examples/v3arch/oneliner/manager/setgen.py b/examples/v3arch/oneliner/manager/setgen.py index 55c9ccf..6f6631d 100644 --- a/examples/v3arch/oneliner/manager/setgen.py +++ b/examples/v3arch/oneliner/manager/setgen.py @@ -18,8 +18,8 @@ if errorIndication: else: if errorStatus: print '%s at %s\n' % ( - errorStatus.prettyOut(errorStatus), varBinds[int(errorIndex)-1] + errorStatus.prettyPrint(), varBinds[int(errorIndex)-1] ) else: for name, val in varBinds: - print '%s = %s' % (name, val.prettyOut(val)) + print '%s = %s' % (name.prettyPrint(), val.prettyPrint()) diff --git a/examples/v3arch/oneliner/manager/withmib/nextgen.py b/examples/v3arch/oneliner/manager/withmib/nextgen.py index 8fde011..b78ad4e 100644 --- a/examples/v3arch/oneliner/manager/withmib/nextgen.py +++ b/examples/v3arch/oneliner/manager/withmib/nextgen.py @@ -28,7 +28,7 @@ if errorIndication: else: if errorStatus: print '%s at %s\n' % ( - errorStatus.prettyOut(errorStatus), + errorStatus.prettyPrint(), varBindTable[-1][int(errorIndex)-1] ) else: @@ -42,6 +42,6 @@ else: ) print '%s::%s.%s = %s' % ( modName, symName, - string.join(map(lambda v: v.prettyOut(v), indices), '.'), - val.prettyOut(val) + string.join(map(lambda v: v.prettyPrint(), indices), '.'), + val.prettyPrint() ) diff --git a/examples/v3arch/oneliner/manager/withmib/setgen.py b/examples/v3arch/oneliner/manager/withmib/setgen.py index 561cd3d..c8c7f17 100644 --- a/examples/v3arch/oneliner/manager/withmib/setgen.py +++ b/examples/v3arch/oneliner/manager/withmib/setgen.py @@ -33,7 +33,7 @@ if errorIndication: else: if errorStatus: print '%s at %s\n' % ( - errorStatus.prettyOut(errorStatus), varBinds[int(errorIndex)-1] + errorStatus.prettyPrint(), varBinds[int(errorIndex)-1] ) else: for oid, val in varBinds: @@ -45,6 +45,6 @@ else: ) print '%s::%s.%s = %s' % ( modName, symName, - string.join(map(lambda v: v.prettyOut(v), indices), '.'), - val.prettyOut(val) + string.join(map(lambda v: v.prettyPrint(), indices), '.'), + val.prettyPrint() ) -- cgit v1.2.1