Merge branch 'master' into ts-type-improvements

docs/source/languages/cpp.md

@@ -57,7 +57,7 @@ a `char *` array, which you pass to `GetMonster()`.
 
 ```cpp
     #include "flatbuffers/flatbuffers.h"
-    #include "monster_test_generate.h"
+    #include "monster_test_generated.h"
     #include <iostream> // C++ header file for printing
     #include <fstream> // C++ header file for file access
 

python/setup.py

@@ -12,9 +12,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from pathlib import Path
+import shutil
+
 from setuptools import setup
 
-setup(
+
+_THIS_DIR = Path(__file__).resolve().parent
+_ROOT_LICENSE = _THIS_DIR.parent / 'LICENSE'
+_LOCAL_LICENSE = _THIS_DIR / 'LICENSE'
+
+
+def _stage_license_file():
+    if _LOCAL_LICENSE.exists() or not _ROOT_LICENSE.exists():
+        return False
+    shutil.copyfile(_ROOT_LICENSE, _LOCAL_LICENSE)
+    return True
+
+_remove_staged_license = _stage_license_file()
+
+try:
+    setup(
         name='flatbuffers',
         version='25.12.19',
         license='Apache 2.0',
@@ -41,4 +59,7 @@ setup(
             'Documentation': 'https://google.github.io/flatbuffers/',
             'Source': 'https://github.com/google/flatbuffers',
         },
-)
+    )
+finally:
+    if _remove_staged_license and _LOCAL_LICENSE.exists():
+        _LOCAL_LICENSE.unlink()

src/idl_gen_python.cpp

@@ -2471,7 +2471,7 @@ class PythonGenerator : public BaseGenerator {
     } else {
       GenPackForScalarVectorFieldHelper(struct_def, field, code_prefix_ptr, 3);
       code_prefix += "(self." + field_field + "[i])";
-      code_prefix += GenIndents(4) + field_field + " = builder.EndVector()";
+      code_prefix += GenIndents(3) + field_field + " = builder.EndVector()";
     }
   }