Commit 97909eac authored by Tiago Peixoto's avatar Tiago Peixoto
Browse files

Fix more compatibility bugs with python 2

parent fdf387eb
...@@ -1309,7 +1309,7 @@ class InternalPropertyDict(dict): ...@@ -1309,7 +1309,7 @@ class InternalPropertyDict(dict):
self[k] = v self[k] = v
class PropertyDict(): class PropertyDict(object):
"""Wrapper for the dict of vertex, graph or edge properties, which sets the """Wrapper for the dict of vertex, graph or edge properties, which sets the
value on the property map when changed in the dict. value on the property map when changed in the dict.
......
...@@ -27,8 +27,19 @@ import os.path ...@@ -27,8 +27,19 @@ import os.path
import tempfile import tempfile
if sys.version_info < (3,): if sys.version_info < (3,):
from urllib2 import urlopen from urllib2 import urlopen
import shutil
class TemporaryDirectory(object):
def __init__(self, suffix="", prefix="", dir=None):
self.name = tempfile.mkdtemp(suffix, prefix, dir)
def __enter__(self):
return self.name
def __exit__(self, exc, value, tb):
shutil.rmtree(self.name)
else: else:
from urllib.request import urlopen from urllib.request import urlopen
from tempfile import TemporaryDirectory
import tarfile import tarfile
import warnings import warnings
import numpy import numpy
...@@ -88,7 +99,7 @@ def get_koblenz_network_data(name): ...@@ -88,7 +99,7 @@ def get_koblenz_network_data(name):
if len(buf) < buflen: if len(buf) < buflen:
break break
ftemp.seek(0) ftemp.seek(0)
with tempfile.TemporaryDirectory(suffix=name) as tempdir: with TemporaryDirectory(suffix=name) as tempdir:
with tarfile.open(fileobj=ftemp, mode='r:bz2') as tar: with tarfile.open(fileobj=ftemp, mode='r:bz2') as tar:
tar.extractall(path=tempdir) tar.extractall(path=tempdir)
g = load_koblenz_dir(tempdir) g = load_koblenz_dir(tempdir)
......
Markdown is supported
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