|
 |
ecd4f90 |
diff -up yawn-20140318/pywbem_yawn/__init__.py.orig yawn-20140318/pywbem_yawn/__init__.py
|
|
|
ecd4f90 |
--- yawn-20140318/pywbem_yawn/__init__.py.orig 2019-05-13 12:21:52.984356124 +0200
|
|
|
ecd4f90 |
+++ yawn-20140318/pywbem_yawn/__init__.py 2019-05-13 12:30:22.246973082 +0200
|
|
|
ecd4f90 |
@@ -478,10 +478,10 @@ class Yawn(object):
|
|
|
ecd4f90 |
namespace=namespaces[ins])
|
|
|
ecd4f90 |
interopns = namespaces[ins]
|
|
|
ecd4f90 |
nsclass = nsclasses[icls]
|
|
|
ecd4f90 |
- except pywbem.CIMError, arg:
|
|
|
ecd4f90 |
- if arg[0] in [pywbem.CIM_ERR_INVALID_NAMESPACE,
|
|
|
ecd4f90 |
- pywbem.CIM_ERR_NOT_SUPPORTED,
|
|
|
ecd4f90 |
- pywbem.CIM_ERR_INVALID_CLASS]:
|
|
|
ecd4f90 |
+ except pywbem.CIMError as arg:
|
|
|
ecd4f90 |
+ if arg.args[0] in [pywbem.CIM_ERR_INVALID_NAMESPACE,
|
|
|
ecd4f90 |
+ pywbem.CIM_ERR_NOT_SUPPORTED,
|
|
|
ecd4f90 |
+ pywbem.CIM_ERR_INVALID_CLASS]:
|
|
|
ecd4f90 |
continue
|
|
|
ecd4f90 |
else:
|
|
|
ecd4f90 |
raise
|
|
|
ecd4f90 |
diff -up yawn-20140318/pywbem_yawn/inputparse.py.orig3 yawn-20140318/pywbem_yawn/inputparse.py
|
|
|
ecd4f90 |
--- yawn-20140318/pywbem_yawn/inputparse.py.orig3 2013-04-26 09:45:08.000000000 +0200
|
|
|
ecd4f90 |
+++ yawn-20140318/pywbem_yawn/inputparse.py 2019-05-13 13:23:25.449769078 +0200
|
|
|
ecd4f90 |
@@ -20,7 +20,7 @@ Utilities and functions for parsing user
|
|
|
ecd4f90 |
"""
|
|
|
ecd4f90 |
|
|
|
ecd4f90 |
import base64
|
|
|
ecd4f90 |
-import cPickle
|
|
|
ecd4f90 |
+import pickle
|
|
|
ecd4f90 |
import pywbem
|
|
|
ecd4f90 |
import re
|
|
|
ecd4f90 |
import zlib
|
|
|
ecd4f90 |
@@ -50,7 +50,7 @@ def decode_reference(encoded_text):
|
|
|
ecd4f90 |
Decompress object path to python object.
|
|
|
ecd4f90 |
"""
|
|
|
ecd4f90 |
try:
|
|
|
ecd4f90 |
- return cPickle.loads(zlib.decompress(base64.urlsafe_b64decode(
|
|
|
ecd4f90 |
+ return pickle.loads(zlib.decompress(base64.urlsafe_b64decode(
|
|
|
ecd4f90 |
encoded_text)))
|
|
|
ecd4f90 |
except Exception:
|
|
|
ecd4f90 |
raise ReferenceDecodeError(path=encoded_text)
|
|
|
ecd4f90 |
diff -up yawn-20140318/pywbem_yawn/render.py.orig3 yawn-20140318/pywbem_yawn/render.py
|
|
|
ecd4f90 |
--- yawn-20140318/pywbem_yawn/render.py.orig3 2013-01-18 11:14:45.000000000 +0100
|
|
|
ecd4f90 |
+++ yawn-20140318/pywbem_yawn/render.py 2019-05-13 13:22:57.113734091 +0200
|
|
|
ecd4f90 |
@@ -19,7 +19,7 @@
|
|
|
ecd4f90 |
Utilities and functions for template rendering.
|
|
|
ecd4f90 |
"""
|
|
|
ecd4f90 |
import base64
|
|
|
ecd4f90 |
-import cPickle
|
|
|
ecd4f90 |
+import pickle
|
|
|
ecd4f90 |
import datetime
|
|
|
ecd4f90 |
from collections import defaultdict
|
|
|
ecd4f90 |
import mako.lookup
|
|
|
ecd4f90 |
@@ -227,7 +227,7 @@ def encode_reference(obj):
|
|
|
ecd4f90 |
@return compressed and encoded object.
|
|
|
ecd4f90 |
"""
|
|
|
ecd4f90 |
return base64.urlsafe_b64encode(
|
|
|
ecd4f90 |
- zlib.compress(cPickle.dumps(obj, cPickle.HIGHEST_PROTOCOL)))
|
|
|
ecd4f90 |
+ zlib.compress(pickle.dumps(obj, pickle.HIGHEST_PROTOCOL)))
|
|
|
ecd4f90 |
|
|
|
ecd4f90 |
def val2str(value):
|
|
|
ecd4f90 |
"""
|