diff options
Diffstat (limited to 'xlators/features/marker/utils/syncdaemon/syncdutils.py')
| -rw-r--r-- | xlators/features/marker/utils/syncdaemon/syncdutils.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/xlators/features/marker/utils/syncdaemon/syncdutils.py b/xlators/features/marker/utils/syncdaemon/syncdutils.py index 244e29628e0..6a08fbdaf9a 100644 --- a/xlators/features/marker/utils/syncdaemon/syncdutils.py +++ b/xlators/features/marker/utils/syncdaemon/syncdutils.py @@ -8,7 +8,11 @@ from threading import Lock, Thread as baseThread from errno import EACCES, EAGAIN, EPIPE, ENOTCONN from signal import SIGTERM, SIGKILL from time import sleep -from cPickle import PickleError +try: + from cPickle import PickleError +except ImportError: + # py 3 + from pickle import PickleError from gconf import gconf @@ -184,7 +188,7 @@ class FreeObject(object): """wildcard class for which any attribute can be set""" def __init__(self, **kw): - for k,v in kw.iteritems(): + for k,v in kw.items(): setattr(self, k, v) class Thread(baseThread): @@ -210,5 +214,5 @@ class Thread(baseThread): baseThread.__init__(self, *a, **kw) self.setDaemon(True) -class GsyncdError(StandardError): +class GsyncdError(Exception): pass |