Modularized output, refactoring

Making it ready for output formatting plugin API.

tests/__init__.py

@@ -10,7 +10,7 @@ import shutil
 import tempfile
 
 import httpie
-from httpie.models import Environment
+from httpie.context import Environment
 from httpie.core import main
 from httpie.compat import bytes, str
 

tests/test_binary.py

@@ -1,6 +1,6 @@
 """Tests for dealing with binary request and response data."""
 from httpie.compat import urlopen
-from httpie.output import BINARY_SUPPRESSED_NOTICE
+from httpie.output.streams import BINARY_SUPPRESSED_NOTICE
 from tests import TestEnvironment, http, httpbin
 from tests.fixtures import BIN_FILE_PATH, BIN_FILE_CONTENT, BIN_FILE_PATH_ARG
 

tests/test_stream.py

@@ -1,7 +1,7 @@
 import pytest
 
 from httpie.compat import is_windows
-from httpie.output import BINARY_SUPPRESSED_NOTICE
+from httpie.output.streams import BINARY_SUPPRESSED_NOTICE
 from tests import http, httpbin, TestEnvironment
 from tests.fixtures import BIN_FILE_CONTENT, BIN_FILE_PATH
 

tests/test_windows.py

@@ -2,8 +2,9 @@ import os
 import tempfile
 
 import pytest
+from httpie.context import Environment
 
-from tests import TestEnvironment, http, httpbin, Environment
+from tests import TestEnvironment, http, httpbin
 from httpie.compat import is_windows