Removed the version keyword

Author: zindy

xlsxwriter/test/comparison/test_macro05.py

@@ -27,8 +27,13 @@ def test_create_file(self):
 
         worksheet = workbook.add_worksheet()
 
-        workbook.add_custom_ui(self.vba_dir + "customUI-01.xml", version=2006)
-        workbook.add_custom_ui(self.vba_dir + "customUI14-01.xml", version=2007)
+        # Adding a Pre-2010 ribbon
+        # (XML namespace is http://schemas.microsoft.com/office/2006/01/customui)
+        workbook.add_custom_ui(self.vba_dir + "customUI-01.xml")
+
+        # Adding a Post-2010 ribbon
+        # (XML namespace is http://schemas.microsoft.com/office/2009/07/customui)
+        workbook.add_custom_ui(self.vba_dir + "customUI14-01.xml")
 
         workbook.add_signed_vba_project(
             self.vba_dir + "vbaProject06.bin",

xlsxwriter/workbook.py

@@ -465,19 +465,36 @@ def use_custom_theme(self, theme: Union[str, os.PathLike, IO[AnyStr]]) -> None:
         self.theme_xml = theme_xml
         self.default_theme_version = ""
 
-    def add_custom_ui(self, custom_ui, version=2007) -> Literal[0, -1]:
+    def add_custom_ui(
+        self, custom_ui: Union[str, os.PathLike, IO[AnyStr]]
+    ) -> Literal[0, -1]:
         """
         Add a custom UI to the Excel workbook.
 
         Args:
             custom_ui:  The custom UI xml file name
-            version:     Excel file version for the ribbon (2006 = pre-excel-2014, 2007 = excel 2014)
-        """
 
+        Returns:
+            0 on success.
+
+        """
         if not os.path.exists(custom_ui):
             warn(f"Custom UI xml file '{custom_ui}' not found.")
             return -1
 
+        # Retrieve the Excel version from the file's namespace:
+        # (2006 = pre-excel-2014, 2007 = excel 2014)
+        # namespace declaration is always in the root element
+        with open(custom_ui, "r", encoding="utf-8") as f:
+            content = f.read(256)
+        if "2006/01/customui" in content:
+            version = 2006
+        elif "2009/07/customui" in content:
+            version = 2007
+        else:
+            warn(f"Unrecognised or missing xmlns namespace in file '{custom_ui}'.")
+            return -1
+
         self.custom_uis.append((custom_ui, version))
 
         return 0