From c552f6a1d457bbd6c47b108789e11da4d9c351aa Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sat, 1 Sep 2018 17:54:10 -0400 Subject: [PATCH] formatting fixes --- gui/copySelectDialog.py | 1 - gui/mainFrame.py | 2 +- service/port/eft.py | 2 +- service/port/port.py | 10 +++++----- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/gui/copySelectDialog.py b/gui/copySelectDialog.py index 45191f6d9..10eff2647 100644 --- a/gui/copySelectDialog.py +++ b/gui/copySelectDialog.py @@ -101,4 +101,3 @@ class CopySelectDialog(wx.Dialog): if v.IsChecked(): i = i ^ x return i - diff --git a/gui/mainFrame.py b/gui/mainFrame.py index ced466577..ee0396c87 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -741,7 +741,7 @@ class MainFrame(wx.Frame): def exportToClipboard(self, event): CopySelectDict = {CopySelectDialog.copyFormatEft: self.clipboardEft, - #CopySelectDialog.copyFormatEftImps: self.clipboardEftImps, + # CopySelectDialog.copyFormatEftImps: self.clipboardEftImps, CopySelectDialog.copyFormatXml: self.clipboardXml, CopySelectDialog.copyFormatDna: self.clipboardDna, CopySelectDialog.copyFormatEsi: self.clipboardEsi, diff --git a/service/port/eft.py b/service/port/eft.py index fbcd4c3b2..fc8576d01 100644 --- a/service/port/eft.py +++ b/service/port/eft.py @@ -226,7 +226,6 @@ def importEft(eftString): _clearTail(section.itemSpecs) sections.append(section) - hasDroneBay = any(s.isDroneBay for s in sections) hasFighterBay = any(s.isFighterBay for s in sections) for section in sections: @@ -507,6 +506,7 @@ def _importPrepareString(eftString): del lines[-1] return lines + def _importGetMutationData(lines): data = {} consumedIndices = set() diff --git a/service/port/port.py b/service/port/port.py index 021b89e07..560af14ea 100644 --- a/service/port/port.py +++ b/service/port/port.py @@ -231,7 +231,7 @@ class Port(object): # Use DNA format for all other cases return "DNA", (cls.importDna(string),) - ### EFT-related methods + # EFT-related methods @staticmethod def importEft(eftString): return importEft(eftString) @@ -244,7 +244,7 @@ class Port(object): def exportEft(cls, fit, options): return exportEft(fit, options) - ### DNA-related methods + # DNA-related methods @staticmethod def importDna(string): return importDna(string) @@ -253,7 +253,7 @@ class Port(object): def exportDna(fit): return exportDna(fit) - ### ESI-related methods + # ESI-related methods @staticmethod def importESI(string): return importESI(string) @@ -262,7 +262,7 @@ class Port(object): def exportESI(fit): return exportESI(fit) - ### XML-related methods + # XML-related methods @staticmethod def importXml(text, iportuser=None): return importXml(text, iportuser) @@ -271,7 +271,7 @@ class Port(object): def exportXml(iportuser=None, *fits): return exportXml(iportuser, *fits) - ### Multibuy-related methods + # Multibuy-related methods @staticmethod def exportMultiBuy(fit): return exportMultiBuy(fit)