python package organization (#232)

benchmarks/__init__.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 import os
 
-from dothttp import Config
-from dothttp.request_base import RequestCompiler
+from dothttp.parse import Config
+from dothttp.parse.request_base import RequestCompiler
 
 
 def run_model():

dotextensions/server/__main__.py

@@ -2,7 +2,7 @@
 import logging
 import sys
 
-from dothttp.log_utils import setup_logging as root_logging_setup
+from dothttp.utils.log_utils import setup_logging as root_logging_setup
 from dothttp.__version__ import __version__
 from .server import AsyncCmdServer, CmdServer, HttpServer
 

dotextensions/server/handlers/basic_handlers.py

@@ -4,10 +4,11 @@
 from requests import RequestException
 
 from dothttp.exceptions import DotHttpException
-from dothttp import Config, HttpDef, MultidefHttp, BaseModelProcessor, UndefinedHttpToExtend, js3py
-from dothttp.request_base import CurlCompiler, RequestCompiler, HttpFileFormatter, dothttp_model
+from dothttp.script import js3py
+from dothttp.parse import BaseModelProcessor, Config, HttpDef, MultidefHttp, UndefinedHttpToExtend
+from dothttp.parse.request_base import CurlCompiler, RequestCompiler, HttpFileFormatter, dothttp_model
 from dothttp.__version__ import __version__
-from dothttp.parse_models import ScriptType
+from dothttp.models.parse_models import ScriptType
 from . import logger
 from ..models import Command, Result, BaseHandler
 

dotextensions/server/handlers/gohandler.py

@@ -1,8 +1,8 @@
 import os
 from typing import Union, Any
 
-from dothttp import MultidefHttp, BaseModelProcessor, Http
-from dothttp.request_base import dothttp_model
+from dothttp.parse import MultidefHttp, BaseModelProcessor, Http
+from dothttp.parse.request_base import dothttp_model
 from ..models import Command, Result, BaseHandler, DothttpTypes
 
 

dotextensions/server/handlers/har2httphandler.py

@@ -6,9 +6,9 @@
 
 import requests
 
-from dothttp import HttpDef, APPLICATION_JSON, FORM_URLENCODED, MultidefHttp, Payload, Http, MULTIPART_FORM_INPUT
-from dothttp.parse_models import HttpFileType
-from dothttp.request_base import HttpFileFormatter
+from dothttp.parse import HttpDef, APPLICATION_JSON, FORM_URLENCODED, MultidefHttp, Payload, Http, MULTIPART_FORM_INPUT
+from dothttp.models.parse_models import HttpFileType
+from dothttp.parse.request_base import HttpFileFormatter
 from . import logger
 from ..models import Command, Result, BaseHandler
 from ..models.har import Harfromdict, HarRequest

dotextensions/server/handlers/http2postman.py

@@ -5,13 +5,13 @@
 from typing import Dict
 
 from requests.auth import HTTPBasicAuth, HTTPDigestAuth
-from dothttp import HttpNtlmAuth
+from dothttp.parse import HttpNtlmAuth
 
 from dotextensions.server.postman2_1 import FormParameterType, File, Mode, AuthType, Variable
-from dothttp import json_or_array_to_json, UndefinedHttpToExtend, ParameterException, HttpDef, \
+from dothttp.parse import json_or_array_to_json, UndefinedHttpToExtend, ParameterException, HttpDef, \
     request_logger, Payload, APPLICATION_JSON, CONTENT_TYPE, AWS4Auth, dothttp_model
-from dothttp.request_base import RequestCompiler
-from dothttp.utils import json_to_urlencoded_array
+from dothttp.parse.request_base import RequestCompiler
+from dothttp.utils.common import json_to_urlencoded_array
 from . import logger
 from .basic_handlers import RunHttpFileHandler
 from ..models import Command, Result

dotextensions/server/handlers/postman2http.py

@@ -7,11 +7,11 @@
 
 import requests
 
-from dothttp import MultidefHttp, Http, NameWrap, UrlWrap, Line, Query, Header, AuthWrap, BasicAuth, DigestAuth, \
+from dothttp.parse import MultidefHttp, Http, NameWrap, UrlWrap, Line, Query, Header, AuthWrap, BasicAuth, DigestAuth, \
     MultiPartFile, FilesWrap, TripleOrDouble, Certificate
-from dothttp.parse_models import NtlmAuthWrap, Payload, AwsAuthWrap, HttpFileType, HawkAuth
-from dothttp.request_base import HttpFileFormatter
-from dothttp.utils import APPLICATION_JSON
+from dothttp.models.parse_models import NtlmAuthWrap, Payload, AwsAuthWrap, HttpFileType, HawkAuth
+from dothttp.parse.request_base import HttpFileFormatter
+from dothttp.utils.common import APPLICATION_JSON
 from . import logger
 from ..models import Command, Result, BaseHandler
 from ..postman import Items, Auth, URLClass, POSTMAN_2, postman_collection_from_dict, AuthType, Variable, FormParameterType as FormParameterType2_0