Fix import of format_keyword from new place in utils

.flake8

@@ -0,0 +1,2 @@
+[flake8]
+ignore = E501

CHANGES.rst

@@ -4,6 +4,7 @@ Changelog
 1.0.0 (unreleased)
 ------------------
 
+- #9 Fix import of format_keyword from new place in utils
 - #8 Fix nexion350x Instrument by not lowering keywords
 - #7 Fix Winlab Instrument by not lowering keywords
 - First version of `senaite.instruments`

src/senaite/instruments/configure.zcml

@@ -2,6 +2,7 @@
     xmlns="http://namespaces.zope.org/zope"
     xmlns:five="http://namespaces.zope.org/five"
     xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
+    xmlns:browser="http://namespaces.zope.org/browser"
     i18n_domain="senaite.instruments">
 
   <five:registerPackage package="." initialize=".initialize" />
@@ -16,4 +17,5 @@
 
   <include package=".instruments" />
 
+
 </configure>

src/senaite/instruments/instruments/agilent/chemstation/chemstation.py

@@ -8,7 +8,7 @@
 from senaite.core.exportimport.instruments import IInstrumentAutoImportInterface
 from senaite.core.exportimport.instruments import IInstrumentExportInterface
 from senaite.core.exportimport.instruments import IInstrumentImportInterface
-from senaite.core.exportimport.instruments.instrument import format_keyword
+from senaite.core.exportimport.instruments.utils import format_keyword
 from senaite.core.exportimport.instruments.resultsimport import AnalysisResultsImporter
 from bika.lims.utils import t
 from cStringIO import StringIO
@@ -74,7 +74,7 @@ def Export(self, context, request):
                             options['dilute_factor'],
                             ""])
             ARs_exported.append(p_uid)
-        tmprows.sort(lambda a, b: cmp(a[1], b[1]))
+        tmprows.sort(lambda a, b: cmp(a[1], b[1]))  # noqa
         rows += tmprows
 
         ramdisk = StringIO()
@@ -244,7 +244,7 @@ def Import(self, context, request):
                 errors = importer.errors
                 logs = importer.logs
                 warns = importer.warns
-            except Exception as e:
+            except Exception:
                 tbex = traceback.format_exc()
                 errors.append(tbex)
 

src/senaite/instruments/instruments/agilent/masshunter/aorc.py

@@ -6,7 +6,7 @@
 from bika.lims import bikaMessageFactory as _
 from senaite.core.exportimport.instruments import IInstrumentAutoImportInterface
 from senaite.core.exportimport.instruments import IInstrumentImportInterface
-from senaite.core.exportimport.instruments.instrument import format_keyword
+from senaite.core.exportimport.instruments.utils import format_keyword
 from senaite.core.exportimport.instruments.resultsimport import AnalysisResultsImporter
 from bika.lims.utils import t
 from DateTime import DateTime
@@ -178,7 +178,7 @@ def Import(self, context, request):
                 errors = importer.errors
                 logs = importer.logs
                 warns = importer.warns
-            except Exception as e:
+            except Exception:
                 tbex = traceback.format_exc()
                 errors.append(tbex)
 

src/senaite/instruments/instruments/agilent/masshunter/qualitative.py

@@ -8,7 +8,7 @@
 from senaite.core.exportimport.instruments import IInstrumentAutoImportInterface
 from senaite.core.exportimport.instruments import IInstrumentExportInterface
 from senaite.core.exportimport.instruments import IInstrumentImportInterface
-from senaite.core.exportimport.instruments.instrument import format_keyword
+from senaite.core.exportimport.instruments.utils import format_keyword
 from senaite.core.exportimport.instruments.resultsimport import AnalysisResultsImporter
 from senaite.core.exportimport.instruments.resultsimport import InstrumentCSVResultsFileParser
 from bika.lims.utils import t
@@ -177,7 +177,7 @@ def Import(self, context, request):
             errors = importer.errors
             logs = importer.logs
             warns = importer.warns
-        except Exception as e:
+        except Exception:
             tbex = traceback.format_exc()
             errors.append(tbex)
 
@@ -245,7 +245,7 @@ def Export(self, context, request):
                 'analysis_uid': getAdapter(item['analysis_uid'], ISuperModel),
                 'sample': getAdapter(item['container_uid'], ISuperModel)
             })
-        rows.sort(lambda a, b: cmp(a['cup'], b['cup']))
+        rows.sort(lambda a, b: cmp(a['cup'], b['cup']))  # noqa
 
         cnt = 0
         for row in rows:

src/senaite/instruments/instruments/agilent/masshunter/quantitative.py

@@ -8,7 +8,7 @@
 from senaite.core.exportimport.instruments import IInstrumentAutoImportInterface
 from senaite.core.exportimport.instruments import IInstrumentExportInterface
 from senaite.core.exportimport.instruments import IInstrumentImportInterface
-from senaite.core.exportimport.instruments.instrument import format_keyword
+from senaite.core.exportimport.instruments.utils import format_keyword
 from senaite.core.exportimport.instruments.resultsimport import AnalysisResultsImporter
 from senaite.core.exportimport.instruments.resultsimport import InstrumentCSVResultsFileParser
 from bika.lims.utils import t
@@ -198,7 +198,7 @@ def Import(self, context, request):
             errors = importer.errors
             logs = importer.logs
             warns = importer.warns
-        except Exception as e:
+        except Exception:
             tbex = traceback.format_exc()
             errors.append(tbex)
 
@@ -267,7 +267,7 @@ def Export(self, context, request):
                 'analysis_uid': getAdapter(item['analysis_uid'], ISuperModel),
                 'sample': getAdapter(item['container_uid'], ISuperModel)
             })
-        rows.sort(lambda a, b: cmp(a['cup'], b['cup']))
+        rows.sort(lambda a, b: cmp(a['cup'], b['cup']))  # noqa
 
         cnt = 0
         for row in rows:

src/senaite/instruments/instruments/data_import.py

@@ -0,0 +1,13 @@
+from senaite.core.browser.form.adapters.data_import import EditForm as EF
+import os
+
+
+class EditForm(EF):
+
+    def get_default_import_template(self):
+        """Returns the path of the default import template
+        """
+        import senaite.instruments.instruments
+        path = os.path.dirname(senaite.instruments.instruments.__file__)
+        template = "instrument.pt"
+        return os.path.join(path, template)

src/senaite/instruments/instruments/instrument.pt

@@ -0,0 +1,29 @@
+<p></p>
+<label for='instrument_results_file'>File</label>&nbsp;
+<input type="file" name="instrument_results_file" id="instrument_results_file"/>&nbsp;&nbsp;
+<p></p>
+<h3>Advanced options</h3>
+<table cellpadding="0" cellspacing="0">
+    <tr>
+        <td><label for="artoapply">Samples state</label>&nbsp;</td>
+        <td>
+            <select name="artoapply" id="artoapply">
+                <option value="received">Received</option>
+                <option value="received_tobeverified">Received and to be verified</option>
+            </select>
+        </td>
+    </tr>
+    <tr>
+        <td><label for="results_override">Results override</label></td>
+        <td>
+            <select name="results_override" id="results_override">
+                <option value="nooverride">Don't override results</option>
+                <option value="override">Override non-empty results</option>
+                <option value="overrideempty">Override non-empty results (also with empty)</option>
+            </select>
+        </td>
+    </tr>
+</table>
+<p></p>
+<input name="firstsubmit" type="submit" value="Submit" i18n:attributes="value"/>
+<p></p>

src/senaite/instruments/instruments/overrides.zcml

@@ -0,0 +1,10 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+       i18n_domain="senaite.instruments">
+
+  <adapter
+      name="data_import_form"
+      for="Products.CMFCore.interfaces.ISiteRoot
+           zope.publisher.interfaces.browser.IBrowserRequest"
+      factory=".data_import.EditForm"/>
+
+</configure>

src/senaite/instruments/interfaces.py

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+"""Module where all interfaces, events and exceptions live."""
+
+from zope.publisher.interfaces.browser import IDefaultBrowserLayer
+
+
+class ISenaiteInstrumentsBrowserLayer(IDefaultBrowserLayer):
+    """Marker interface that defines a browser layer."""

src/senaite/instruments/overrides.zcml

@@ -0,0 +1,7 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+       xmlns:zcml="http://namespaces.zope.org/browser"
+       i18n_domain="senaite.instruments">
+
+     <include package=".instruments" file="overrides.zcml" />
+
+</configure>

src/senaite/instruments/profiles/default/browserlayer.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layers>
+  <layer
+      name="bika.instruments"
+      interface="senaite.instruments.interfaces.ISenaiteInstrumentsBrowserLayer"
+      />
+</layers>
+