Mercurial Repositories > eric / changeset

--- a/DebugClients/Python/DebugVariables.py	Mon Oct 17 19:51:51 2016 +0200
+++ b/DebugClients/Python/DebugVariables.py	Mon Oct 17 19:59:52 2016 +0200
@@ -498,6 +498,7 @@
         "f": "float (float)",
         "d": "float (double)",
     }
+    
     def resolve(self, var, attribute):
         """
         Public method to get an attribute from a variable.

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Source/eric6.WebBrowser.Tools.FilePrinter.html	Mon Oct 17 19:51:51 2016 +0200
+++ b/Documentation/Source/eric6.WebBrowser.Tools.FilePrinter.html	Mon Oct 17 19:59:52 2016 +0200
@@ -88,7 +88,7 @@
 <td>Protected method to assemble the printer destination arguments.</td>
 </tr><tr>
 <td><a href="#FilePrinter._doPrintFile">_doPrintFile</a></td>
-<td>Protected method to print a file</td>
+<td>Protected method to print a file.</td>
 </tr><tr>
 <td><a href="#FilePrinter._jobname">_jobname</a></td>
 <td>Protected method to assemble the jobname arguments.</td>
@@ -260,7 +260,7 @@
 <h4>FilePrinter._doPrintFile</h4>
 <b>_doPrintFile</b>(<i>printer, fileName, fileDeletePolicy, pageSelectPolicy, pageRange</i>)
 <p>
-        Protected method to print a file
+        Protected method to print a file.
 </p><dl>
 <dt><i>printer</i> (QPrinter)</dt>
 <dd>

--- a/E5Gui/E5ListSelectionDialog.py	Mon Oct 17 19:51:51 2016 +0200
+++ b/E5Gui/E5ListSelectionDialog.py	Mon Oct 17 19:59:52 2016 +0200
@@ -7,6 +7,8 @@
 Module implementing a dialog to select from a list of strings.
 """
 
+from __future__ import unicode_literals
+
 from PyQt5.QtCore import pyqtSlot
 from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QAbstractItemView
 

--- a/WebBrowser/Download/DownloadItem.py	Mon Oct 17 19:51:51 2016 +0200
+++ b/WebBrowser/Download/DownloadItem.py	Mon Oct 17 19:59:52 2016 +0200
@@ -126,7 +126,7 @@
         
         if qVersion() >= "5.7.0":
             savePage = self.__downloadItem.savePageFormat() != \
-                        QWebEngineDownloadItem.UnknownSaveFormat
+                QWebEngineDownloadItem.UnknownSaveFormat
         else:
             savePage = self.__downloadItem.path().lower().endswith(
                 (".mhtml", ".mht"))

--- a/WebBrowser/Network/SslErrorExceptionsDialog.py	Mon Oct 17 19:51:51 2016 +0200
+++ b/WebBrowser/Network/SslErrorExceptionsDialog.py	Mon Oct 17 19:59:52 2016 +0200
@@ -72,7 +72,8 @@
         try:
             self.__errorDescriptions[
                 QWebEngineCertificateError.CertificateValidityTooLong] = \
-            self.tr("The certificate has a validity period that is too long.")
+                self.tr("The certificate has a validity period that is"
+                        " too long.")
         except AttributeError:
             # the value was added in Qt 5.7
             pass

--- a/WebBrowser/Tools/FilePrinter.py	Mon Oct 17 19:51:51 2016 +0200
+++ b/WebBrowser/Tools/FilePrinter.py	Mon Oct 17 19:59:52 2016 +0200
@@ -22,6 +22,7 @@
 
 _FilePrintJobs = []
 
+
 class FilePrinter(object):
     """
     Class implementing methods for printing on *nix systems.
@@ -110,7 +111,7 @@
     def _doPrintFile(self, printer, fileName, fileDeletePolicy,
                      pageSelectPolicy, pageRange):
         """
-        Protected method to print a file
+        Protected method to print a file.
         
         @param printer reference to the printer to print to
         @type QPrinter
@@ -573,4 +574,3 @@
     if fp._doPrintFile(printer, fileName, fileDeletePolicy, pageSelectPolicy,
                        pageRange):
         _FilePrintJobs.append(fp)
-