Intermediate changes

4 files changed, 75 insertions, 59 deletions

diff --git a/yt/python/yt/type_info/test/lib/ya.make b/yt/python/yt/type_info/test/lib/ya.make
index ffbccab8508..84ed5285dcb 100644
--- a/yt/python/yt/type_info/test/lib/ya.make
+++ b/yt/python/yt/type_info/test/lib/ya.make
@@ -1,22 +1,26 @@
 PY23_LIBRARY()
 
-TEST_SRCS(
-    conftest.py
-    test_common.py
-    test_helpers.py
-    test_typing.py
-    test_io.py
-    helpers.py
-)
+IF (PYTHON2)
+    PEERDIR(yt/python_py2/yt/type_info/test/lib)
+ELSE()
+    TEST_SRCS(
+        conftest.py
+        test_common.py
+        test_helpers.py
+        test_typing.py
+        test_io.py
+        helpers.py
+    )
 
-PEERDIR(
-    library/python/cyson
-    yt/python/yt/type_info
-)
+    PEERDIR(
+        library/python/cyson
+        yt/python/yt/type_info
+    )
 
-RESOURCE_FILES(
-    library/cpp/type_info/ut/test-data/good-types.txt
-    library/cpp/type_info/ut/test-data/bad-types.txt
-)
+    RESOURCE_FILES(
+        library/cpp/type_info/ut/test-data/good-types.txt
+        library/cpp/type_info/ut/test-data/bad-types.txt
+    )
+ENDIF()
 
 END()
diff --git a/yt/python/yt/type_info/ya.make b/yt/python/yt/type_info/ya.make
index 22777dca01d..6463783fa2a 100644
--- a/yt/python/yt/type_info/ya.make
+++ b/yt/python/yt/type_info/ya.make
@@ -1,16 +1,20 @@
 PY23_LIBRARY()
 
-PY_SRCS(
-    NAMESPACE yt.type_info
+IF (PYTHON2)
+    PEERDIR(yt/python_py2/yt/type_info)
+ELSE()
+    PY_SRCS(
+        NAMESPACE yt.type_info
 
-    __init__.py
-    typing.py
-    type_base.py
-)
+        __init__.py
+        typing.py
+        type_base.py
+    )
 
-PEERDIR(
-    contrib/python/six
-)
+    PEERDIR(
+        contrib/python/six
+    )
+ENDIF()
 
 END()
 
diff --git a/yt/python/yt/ya.make b/yt/python/yt/ya.make
index 7d72655d65d..a643b103a0b 100644
--- a/yt/python/yt/ya.make
+++ b/yt/python/yt/ya.make
@@ -1,26 +1,30 @@
 PY23_LIBRARY()
 
-PEERDIR(
-    contrib/python/simplejson
-    contrib/python/six
-    yt/python/yt/type_info 
-)
-
-IF(LINUX)
+IF (PYTHON2)
+    PEERDIR(yt/python_py2/yt)
+ELSE()
     PEERDIR(
-        library/python/prctl
+        contrib/python/simplejson
+        contrib/python/six
+        yt/python/yt/type_info 
     )
-ENDIF()
 
-PY_SRCS(
-    NAMESPACE yt
+    IF(LINUX)
+        PEERDIR(
+            library/python/prctl
+        )
+    ENDIF()
+
+    PY_SRCS(
+        NAMESPACE yt
 
-    __init__.py
-    common.py
-    json_wrapper.py
-    logger.py
-    logger_config.py
-    subprocess_wrapper.py
-)
+        __init__.py
+        common.py
+        json_wrapper.py
+        logger.py
+        logger_config.py
+        subprocess_wrapper.py
+    )
+ENDIF()
 
 END()
diff --git a/yt/python/yt/yson/ya.make b/yt/python/yt/yson/ya.make
index 37bf8a4046a..30edbee0f32 100644
--- a/yt/python/yt/yson/ya.make
+++ b/yt/python/yt/yson/ya.make
@@ -1,23 +1,27 @@
 PY23_LIBRARY()
 
-PEERDIR(
-    yt/python/yt
+IF (PYTHON2)
+    PEERDIR(yt/python_py2/yt/yson)
+ELSE()
+    PEERDIR(
+        yt/python/yt
 
-    contrib/python/six
-)
+        contrib/python/six
+    )
 
-PY_SRCS(
-    NAMESPACE yt.yson
+    PY_SRCS(
+        NAMESPACE yt.yson
 
-    __init__.py
-    common.py
-    convert.py
-    lexer.py
-    parser.py
-    tokenizer.py
-    writer.py
-    yson_token.py
-    yson_types.py
-)
+        __init__.py
+        common.py
+        convert.py
+        lexer.py
+        parser.py
+        tokenizer.py
+        writer.py
+        yson_token.py
+        yson_types.py
+    )
+ENDIF()
 
 END()