Mercurial Repositories > eric / changeset

--- a/eric6/MicroPython/MicroPythonFileManager.py	Thu Aug 15 17:04:54 2019 +0200
+++ b/eric6/MicroPython/MicroPythonFileManager.py	Thu Aug 15 17:19:28 2019 +0200
@@ -225,8 +225,8 @@
                     destinationDict[name] = nstat
         else:
             try:
-                destinationFiles = self.__commandsInterface.lls(deviceDirectory,
-                                                                fullstat=True)
+                destinationFiles = self.__commandsInterface.lls(
+                    deviceDirectory, fullstat=True)
             except Exception as exc:
                 return [str(exc)]
             if destinationFiles is None:

--- a/eric6/MicroPython/MicroPythonWidget.py	Thu Aug 15 17:04:54 2019 +0200
+++ b/eric6/MicroPython/MicroPythonWidget.py	Thu Aug 15 17:19:28 2019 +0200
@@ -1182,8 +1182,8 @@
                     self,
                     self.tr("Synchronize Time"),
                     self.tr("<p>The time of the connected device was"
-                            " synchronized with the local time.</p>")
-                    + self.__getDeviceTime()
+                            " synchronized with the local time.</p>") +
+                    self.__getDeviceTime()
                 )
         except Exception as exc:
             self.__showError("syncTime()", str(exc))
@@ -1200,7 +1200,7 @@
             dateTimeString = self.__interface.getTime()
             try:
                 date, time = dateTimeString.strip().split(None, 1)
-                msg = self.tr(
+                return self.tr(
                     "<h3>Device Date and Time</h3>"
                     "<table>"
                     "<tr><td><b>Date</b></td><td>{0}</td></tr>"
@@ -1208,11 +1208,10 @@
                     "</table>"
                 ).format(date, time)
             except ValueError:
-                msg = self.tr(
+                return self.tr(
                     "<h3>Device Date and Time</h3>"
                     "<p>{0}</p>"
                 ).format(dateTimeString.strip())
-            return msg
         except Exception as exc:
             self.__showError("getTime()", str(exc))
             return ""

--- a/eric6/Preferences/__init__.py	Thu Aug 15 17:04:54 2019 +0200
+++ b/eric6/Preferences/__init__.py	Thu Aug 15 17:19:28 2019 +0200
@@ -3831,7 +3831,7 @@
             "MicroPython/" + key,
             prefClass.microPythonDefaults[key]))
     elif key in ["ReplLineWrap", "SyncTimeAfterConnect", "ShowHiddenLocal",
-                 "ShowHiddenDevice",]:
+                 "ShowHiddenDevice"]:
         return toBool(prefClass.settings.value(
             "MicroPython/" + key,
             prefClass.microPythonDefaults[key]))

--- a/eric6/UI/FindFileDialog.py	Thu Aug 15 17:04:54 2019 +0200
+++ b/eric6/UI/FindFileDialog.py	Thu Aug 15 17:19:28 2019 +0200
@@ -242,10 +242,10 @@
 
     @pyqtSlot()
     def on_openFilesButton_clicked(self):
-       """
-       Private slot to handle the selection of the 'Open Files' radio button.
-       """
-       self.__enableFindButton()
+        """
+        Private slot to handle the selection of the 'Open Files' radio button.
+        """
+        self.__enableFindButton()
     
     @pyqtSlot()
     def on_filterCheckBox_clicked(self):