From 25973554e26980030fbdbae33a9ba621b26e14b6 Mon Sep 17 00:00:00 2001
From: Dave Halter <davidhalter88@gmail.com>
Date: Fri, 8 May 2020 13:23:56 +0200
Subject: [PATCH] Remove the common folder and move it to a common file

---
 jedi/api/project.py                 | 2 +-
 jedi/api/refactoring/extract.py     | 2 +-
 jedi/{common/utils.py => common.py} | 0
 jedi/common/__init__.py             | 0
 jedi/inference/docstrings.py        | 2 +-
 jedi/inference/lazy_value.py        | 2 +-
 jedi/inference/sys_path.py          | 2 +-
 test/test_integration.py            | 2 +-
 8 files changed, 6 insertions(+), 6 deletions(-)
 rename jedi/{common/utils.py => common.py} (100%)
 delete mode 100644 jedi/common/__init__.py

diff --git a/jedi/api/project.py b/jedi/api/project.py
index e01a87a3..a2b7c4c1 100644
--- a/jedi/api/project.py
+++ b/jedi/api/project.py
@@ -26,7 +26,7 @@ from jedi.inference.sys_path import discover_buildout_paths
 from jedi.inference.cache import inference_state_as_method_param_cache
 from jedi.inference.references import recurse_find_python_folders_and_files, search_in_file_ios
 from jedi.file_io import FolderIO
-from jedi.common.utils import traverse_parents
+from jedi.common import traverse_parents
 
 _CONFIG_FOLDER = '.jedi'
 _CONTAINS_POTENTIAL_PROJECT = \
diff --git a/jedi/api/refactoring/extract.py b/jedi/api/refactoring/extract.py
index cefdf5ea..15bc6527 100644
--- a/jedi/api/refactoring/extract.py
+++ b/jedi/api/refactoring/extract.py
@@ -5,7 +5,7 @@ from parso import split_lines
 from jedi import debug
 from jedi.api.exceptions import RefactoringError
 from jedi.api.refactoring import Refactoring, EXPRESSION_PARTS
-from jedi.common.utils import indent_block
+from jedi.common import indent_block
 from jedi.parser_utils import function_is_classmethod, function_is_staticmethod
 
 
diff --git a/jedi/common/utils.py b/jedi/common.py
similarity index 100%
rename from jedi/common/utils.py
rename to jedi/common.py
diff --git a/jedi/common/__init__.py b/jedi/common/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/jedi/inference/docstrings.py b/jedi/inference/docstrings.py
index 5f0941e8..ab34cf93 100644
--- a/jedi/inference/docstrings.py
+++ b/jedi/inference/docstrings.py
@@ -23,7 +23,7 @@ from parso import parse, ParserSyntaxError
 
 from jedi._compatibility import u
 from jedi import debug
-from jedi.common.utils import indent_block
+from jedi.common import indent_block
 from jedi.inference.cache import inference_state_method_cache
 from jedi.inference.base_value import iterator_to_value_set, ValueSet, \
     NO_VALUES
diff --git a/jedi/inference/lazy_value.py b/jedi/inference/lazy_value.py
index 44f8d596..c7c22a91 100644
--- a/jedi/inference/lazy_value.py
+++ b/jedi/inference/lazy_value.py
@@ -1,5 +1,5 @@
 from jedi.inference.base_value import ValueSet, NO_VALUES
-from jedi.common.utils import monkeypatch
+from jedi.common import monkeypatch
 
 
 class AbstractLazyValue(object):
diff --git a/jedi/inference/sys_path.py b/jedi/inference/sys_path.py
index 32a3f6b0..5b82ec15 100644
--- a/jedi/inference/sys_path.py
+++ b/jedi/inference/sys_path.py
@@ -5,7 +5,7 @@ from jedi._compatibility import unicode, force_unicode, all_suffixes
 from jedi.inference.cache import inference_state_method_cache
 from jedi.inference.base_value import ContextualizedNode
 from jedi.inference.helpers import is_string, get_str_or_none
-from jedi.common.utils import traverse_parents
+from jedi.common import traverse_parents
 from jedi.parser_utils import get_cached_code_lines
 from jedi.file_io import FileIO
 from jedi import settings
diff --git a/test/test_integration.py b/test/test_integration.py
index 0cc1636b..b55aca77 100644
--- a/test/test_integration.py
+++ b/test/test_integration.py
@@ -4,7 +4,7 @@ import sys
 import pytest
 
 from . import helpers
-from jedi.common.utils import indent_block
+from jedi.common import indent_block
 from jedi import RefactoringError