Sync contrib/tools/python3 layout with upstream

* Move src/ subdir contents to the top of the layout
* Rename self-written lib -> lib2 to avoid CaseFolding warning from the VCS
* Regenerate contrib/libs/python proxy-headers accordingly
4ccc62ac1511abcf0fed14ccade38e984e088f1e

16 files changed, 16 insertions, 16 deletions

diff --git a/contrib/libs/python/Include/Python.h b/contrib/libs/python/Include/Python.h
index 5aa4c0b515a..e4e394a30cd 100644
--- a/contrib/libs/python/Include/Python.h
+++ b/contrib/libs/python/Include/Python.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #ifdef USE_PYTHON3
-#include <contrib/tools/python3/src/Include/Python.h>
+#include <contrib/tools/python3/Include/Python.h>
 #else
 #include <contrib/tools/python/src/Include/Python.h>
 #endif
diff --git a/contrib/libs/python/Include/abstract.h b/contrib/libs/python/Include/abstract.h
index 3073b25e256..6ec6fdd27ff 100644
--- a/contrib/libs/python/Include/abstract.h
+++ b/contrib/libs/python/Include/abstract.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #ifdef USE_PYTHON3
-#include <contrib/tools/python3/src/Include/abstract.h>
+#include <contrib/tools/python3/Include/abstract.h>
 #else
 #include <contrib/tools/python/src/Include/abstract.h>
 #endif
diff --git a/contrib/libs/python/Include/compile.h b/contrib/libs/python/Include/compile.h
index eb3595aab00..4d0a014413c 100644
--- a/contrib/libs/python/Include/compile.h
+++ b/contrib/libs/python/Include/compile.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #ifdef USE_PYTHON3
-#include <contrib/tools/python3/src/Include/compile.h>
+#include <contrib/tools/python3/Include/compile.h>
 #else
 #include <contrib/tools/python/src/Include/compile.h>
 #endif
diff --git a/contrib/libs/python/Include/datetime.h b/contrib/libs/python/Include/datetime.h
index b24acd56380..bf11bfd29b6 100644
--- a/contrib/libs/python/Include/datetime.h
+++ b/contrib/libs/python/Include/datetime.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #ifdef USE_PYTHON3
-#include <contrib/tools/python3/src/Include/datetime.h>
+#include <contrib/tools/python3/Include/datetime.h>
 #else
 #include <contrib/tools/python/src/Include/datetime.h>
 #endif
diff --git a/contrib/libs/python/Include/descrobject.h b/contrib/libs/python/Include/descrobject.h
index 5d450cf256a..55164c1b7b7 100644
--- a/contrib/libs/python/Include/descrobject.h
+++ b/contrib/libs/python/Include/descrobject.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #ifdef USE_PYTHON3
-#include <contrib/tools/python3/src/Include/descrobject.h>
+#include <contrib/tools/python3/Include/descrobject.h>
 #else
 #include <contrib/tools/python/src/Include/descrobject.h>
 #endif
diff --git a/contrib/libs/python/Include/frameobject.h b/contrib/libs/python/Include/frameobject.h
index 50168e372a2..d92b5e157fe 100644
--- a/contrib/libs/python/Include/frameobject.h
+++ b/contrib/libs/python/Include/frameobject.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #ifdef USE_PYTHON3
-#include <contrib/tools/python3/src/Include/frameobject.h>
+#include <contrib/tools/python3/Include/frameobject.h>
 #else
 #include <contrib/tools/python/src/Include/frameobject.h>
 #endif
diff --git a/contrib/libs/python/Include/internal/pycore_frame.h b/contrib/libs/python/Include/internal/pycore_frame.h
index 09ebc0ed139..80e07d19edd 100644
--- a/contrib/libs/python/Include/internal/pycore_frame.h
+++ b/contrib/libs/python/Include/internal/pycore_frame.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #ifdef USE_PYTHON3
-#include <contrib/tools/python3/src/Include/internal/pycore_frame.h>
+#include <contrib/tools/python3/Include/internal/pycore_frame.h>
 #else
 #error "No <internal/pycore_frame.h> in Python2"
 #endif
diff --git a/contrib/libs/python/Include/pyconfig.h b/contrib/libs/python/Include/pyconfig.h
index 3b13edb2ee6..9bb42954b26 100644
--- a/contrib/libs/python/Include/pyconfig.h
+++ b/contrib/libs/python/Include/pyconfig.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #ifdef USE_PYTHON3
-#include <contrib/tools/python3/src/Include/pyconfig.h>
+#include <contrib/tools/python3/Include/pyconfig.h>
 #else
 #include <contrib/tools/python/src/Include/pyconfig.h>
 #endif
diff --git a/contrib/libs/python/Include/pyerrors.h b/contrib/libs/python/Include/pyerrors.h
index 587690a2b28..9a9ec600ad3 100644
--- a/contrib/libs/python/Include/pyerrors.h
+++ b/contrib/libs/python/Include/pyerrors.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #ifdef USE_PYTHON3
-#include <contrib/tools/python3/src/Include/pyerrors.h>
+#include <contrib/tools/python3/Include/pyerrors.h>
 #else
 #include <contrib/tools/python/src/Include/pyerrors.h>
 #endif
diff --git a/contrib/libs/python/Include/pymem.h b/contrib/libs/python/Include/pymem.h
index 780aa553e13..f51871a02a3 100644
--- a/contrib/libs/python/Include/pymem.h
+++ b/contrib/libs/python/Include/pymem.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #ifdef USE_PYTHON3
-#include <contrib/tools/python3/src/Include/pymem.h>
+#include <contrib/tools/python3/Include/pymem.h>
 #else
 #include <contrib/tools/python/src/Include/pymem.h>
 #endif
diff --git a/contrib/libs/python/Include/pystate.h b/contrib/libs/python/Include/pystate.h
index 6601f2591b1..e37e92bff12 100644
--- a/contrib/libs/python/Include/pystate.h
+++ b/contrib/libs/python/Include/pystate.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #ifdef USE_PYTHON3
-#include <contrib/tools/python3/src/Include/pystate.h>
+#include <contrib/tools/python3/Include/pystate.h>
 #else
 #include <contrib/tools/python/src/Include/pystate.h>
 #endif
diff --git a/contrib/libs/python/Include/pythread.h b/contrib/libs/python/Include/pythread.h
index 3f3eae9530b..b56d6cbce7f 100644
--- a/contrib/libs/python/Include/pythread.h
+++ b/contrib/libs/python/Include/pythread.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #ifdef USE_PYTHON3
-#include <contrib/tools/python3/src/Include/pythread.h>
+#include <contrib/tools/python3/Include/pythread.h>
 #else
 #include <contrib/tools/python/src/Include/pythread.h>
 #endif
diff --git a/contrib/libs/python/Include/structmember.h b/contrib/libs/python/Include/structmember.h
index ab8d9c29245..e6477591b82 100644
--- a/contrib/libs/python/Include/structmember.h
+++ b/contrib/libs/python/Include/structmember.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #ifdef USE_PYTHON3
-#include <contrib/tools/python3/src/Include/structmember.h>
+#include <contrib/tools/python3/Include/structmember.h>
 #else
 #include <contrib/tools/python/src/Include/structmember.h>
 #endif
diff --git a/contrib/libs/python/Include/structseq.h b/contrib/libs/python/Include/structseq.h
index 02cadaaefe4..46e9df6674b 100644
--- a/contrib/libs/python/Include/structseq.h
+++ b/contrib/libs/python/Include/structseq.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #ifdef USE_PYTHON3
-#include <contrib/tools/python3/src/Include/structseq.h>
+#include <contrib/tools/python3/Include/structseq.h>
 #else
 #include <contrib/tools/python/src/Include/structseq.h>
 #endif
diff --git a/contrib/libs/python/Include/traceback.h b/contrib/libs/python/Include/traceback.h
index 284fc8ab7f5..51d9b6c771e 100644
--- a/contrib/libs/python/Include/traceback.h
+++ b/contrib/libs/python/Include/traceback.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #ifdef USE_PYTHON3
-#include <contrib/tools/python3/src/Include/traceback.h>
+#include <contrib/tools/python3/Include/traceback.h>
 #else
 #include <contrib/tools/python/src/Include/traceback.h>
 #endif
diff --git a/contrib/libs/python/Include/unicodeobject.h b/contrib/libs/python/Include/unicodeobject.h
index 172af650e1c..d5394ac4079 100644
--- a/contrib/libs/python/Include/unicodeobject.h
+++ b/contrib/libs/python/Include/unicodeobject.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #ifdef USE_PYTHON3
-#include <contrib/tools/python3/src/Include/unicodeobject.h>
+#include <contrib/tools/python3/Include/unicodeobject.h>
 #else
 #include <contrib/tools/python/src/Include/unicodeobject.h>
 #endif