git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
blind and brutal 2to3
[nodemanager.git]
/
plcapi.py
diff --git
a/plcapi.py
b/plcapi.py
index
acccda0
..
a03e9e0
100644
(file)
--- a/
plcapi.py
+++ b/
plcapi.py
@@
-28,7
+28,7
@@
class PLCAPI:
if isinstance(auth, (tuple, list)):
(self.node_id, self.key) = auth
self.session = None
if isinstance(auth, (tuple, list)):
(self.node_id, self.key) = auth
self.session = None
- elif isinstance(auth,
(str, unicode)
):
+ elif isinstance(auth,
str
):
self.node_id = self.key = None
self.session = auth
else:
self.node_id = self.key = None
self.session = auth
else:
@@
-85,10
+85,10
@@
class PLCAPI:
# Yes, the comments in the old implementation are
# misleading. Keys of dicts are not included in the
# hash.
# Yes, the comments in the old implementation are
# misleading. Keys of dicts are not included in the
# hash.
- values += canonicalize(
arg.values(
))
+ values += canonicalize(
list(arg.values()
))
else:
# We use unicode() instead of str().
else:
# We use unicode() instead of str().
- values.append(
unicode
(arg))
+ values.append(
str
(arg))
return values
return values