Accept XML headers with extra info

gui/mainFrame.py

@@ -771,7 +771,7 @@ class MainFrame(wx.Frame):
                 if self.command.Submit(cmd.GuiImportCargosCommand(activeFit, [(i.ID, a) for i, a in importData[0]])):
                     self.additionsPane.select("Cargo")
                 return
-        except:
+        except ImportError:
             pyfalog.error("Attempt to import failed:\n{0}", clipboard)
         else:
             self._openAfterImport(importData)

service/port/port.py

@@ -47,7 +47,7 @@ from service.port.muta import parseMutant
 pyfalog = Logger(__name__)
 
 # 2017/04/05 NOTE: simple validation, for xml file
-RE_XML_START = r'<\?xml\s+version="1.0"\s*\?>'
+RE_XML_START = r'<\?xml\s+version="1.0"[^<>]*\?>'
 
 
 class Port:
@@ -321,4 +321,4 @@ class Port:
 
     @staticmethod
     def exportFitStats(fit, callback=None):
-        return exportFitStats(fit, callback=callback)
+        return exportFitStats(fit, callback=callback)