Commit 958198e1 authored by Kipp Cannon's avatar Kipp Cannon
Browse files

Merge branch 'lalburst_python3_again' into 'master'

lalburst:  more python 3 changes

See merge request !517
parents 900e4ecd 8e12134a
Pipeline #35427 passed with stages
in 25 minutes and 56 seconds
......@@ -48,7 +48,10 @@ import scipy.optimize
from scipy import spatial
import sys
from UserDict import DictMixin as UserDict
# python 2
from UserDict import DictMixin
class UserDict(object, DictMixin):
except ImportError:
# python 3
from collections import UserDict
......@@ -243,7 +246,7 @@ class singlesqueue(object):
return tuple(events), tuple(itertools.takewhile(lambda event: self.event_time(event) < t, self.queue))
class multidict(object, UserDict):
class multidict(UserDict):
Read-only dictionary view into a collection of dictionaries.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment