From 123e3b130c87e53092a4f8c66effc8605298e1d0 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Sat, 21 May 2016 11:53:14 +1200
Subject: We don't need 3 slightly different implementations of Data

---
 test/mitmproxy/test_examples.py | 3 ++-
 test/mitmproxy/tutils.py        | 3 ++-
 test/pathod/tutils.py           | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/mitmproxy/test_examples.py b/test/mitmproxy/test_examples.py
index c401a6b9..0c117306 100644
--- a/test/mitmproxy/test_examples.py
+++ b/test/mitmproxy/test_examples.py
@@ -5,11 +5,12 @@ from contextlib import contextmanager
 
 from mitmproxy import utils, script
 from mitmproxy.proxy import config
+import netlib.utils
 from netlib import tutils as netutils
 from netlib.http import Headers
 from . import tservers, tutils
 
-example_dir = utils.Data(__name__).path("../../examples")
+example_dir = netlib.utils.Data(__name__).path("../../examples")
 
 
 class DummyContext(object):
diff --git a/test/mitmproxy/tutils.py b/test/mitmproxy/tutils.py
index d51ac185..2dfd710e 100644
--- a/test/mitmproxy/tutils.py
+++ b/test/mitmproxy/tutils.py
@@ -8,6 +8,7 @@ from contextlib import contextmanager
 
 from unittest.case import SkipTest
 
+import netlib.utils
 import netlib.tutils
 from mitmproxy import utils, controller
 from mitmproxy.models import (
@@ -163,4 +164,4 @@ def capture_stderr(command, *args, **kwargs):
     sys.stderr = out
 
 
-test_data = utils.Data(__name__)
+test_data = netlib.utils.Data(__name__)
diff --git a/test/pathod/tutils.py b/test/pathod/tutils.py
index 9739afde..f6ed3efb 100644
--- a/test/pathod/tutils.py
+++ b/test/pathod/tutils.py
@@ -116,7 +116,7 @@ tmpdir = netlib.tutils.tmpdir
 
 raises = netlib.tutils.raises
 
-test_data = utils.Data(__name__)
+test_data = netlib.utils.Data(__name__)
 
 
 def render(r, settings=language.Settings()):
-- 
cgit v1.2.3