run 2to3 on source

Author: jef-n

INSTALL

@@ -1,10 +1,10 @@
 QGIS
 Building QGIS from source - step by step
-Thursday June 09, 2016
+Wednesday September 21, 2016
 
 
-Last Updated: Thursday June 09, 2016
-Last Change : Thursday June 09, 2016
+Last Updated: Wednesday September 21, 2016
+Last Change : Wednesday July 27, 2016
 
 
   1. Introduction
@@ -356,7 +356,7 @@ If you want to use `ccmake` or other interactive tools, run the following
 command in the empty build directory once before starting to use the
 interactive tools.
 
-  cmake -DENABLE_QT5=ON -DPORT_PLUGINS=ON
+  cmake
 
 If everything went ok you can finally start to compile. (As usual append a -jX where X is the number of available cores option to make to speed up your build process)
 

ci/travis/linux/qt5/install.sh

@@ -52,6 +52,5 @@ cmake \
       -DWITH_SERVER=ON \
       -DWITH_INTERNAL_YAML=OFF \
       -DDISABLE_DEPRECATED=ON \
-      -DPORT_PLUGINS=ON \
       -DCXX_EXTRA_FLAGS="$CLANG_WARNINGS" \
       ..

doc/INSTALL.html

@@ -5,7 +5,7 @@
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
 <TITLE>QGIS</TITLE>
 
-<!-- Included /home/fischer/src/qgis/doc/style.css -->
+<!-- Included /home/fischer/src/qgis3/doc/style.css -->
 <STYLE TYPE="text/css">
 body{  background: white;
   color: black;
@@ -77,13 +77,13 @@
 <DIV CLASS="header" ID="header">
 <H1>QGIS</H1>
 <H2>Building QGIS from source - step by step</H2>
-<H3>Thursday June 09, 2016</H3>
+<H3>Wednesday September 21, 2016</H3>
 </DIV>
 
 <DIV CLASS="body" ID="body">
 <P>
-Last Updated: Thursday June 09, 2016
-Last Change : Thursday June 09, 2016
+Last Updated: Wednesday September 21, 2016
+Last Change : Wednesday July 27, 2016
 </P>
 <DIV CLASS="toc">
 
@@ -577,7 +577,7 @@ <H3>3.10.1. Install build dependencies</H3>
 </P>
 
 <div class="code"><PRE>
-cmake -DENABLE_QT5=ON -DPORT_PLUGINS=ON
+cmake
 </PRE></div>
 
 <P>
@@ -3016,5 +3016,5 @@ <H1>9. Authors and Acknowledgments</H1>
 
 </DIV>
 <!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
-<!-- cmdline: txt2tags -\-encoding=utf-8 -o/home/fischer/src/qgis/debian/build-master-pyqtwrapper-qt4/doc/INSTALL.html -t html /home/fischer/src/qgis/doc/INSTALL.t2t -->
+<!-- cmdline: txt2tags -\-encoding=utf-8 -o/home/fischer/src/qgis3/debian/build-master-qt5/doc/INSTALL.html -t html /home/fischer/src/qgis3/doc/INSTALL.t2t -->
 </BODY></HTML>

doc/linux.t2t

@@ -235,7 +235,7 @@ command in the empty build directory once before starting to use the
 interactive tools.
 
 ```
-cmake -DENABLE_QT5=ON -DPORT_PLUGINS=ON
+cmake
 ```
 
 If everything went ok you can finally start to compile. (As usual append a -jX where X is the number of available cores option to make to speed up your build process)

python/__init__.py

@@ -16,6 +16,7 @@
 *                                                                         *
 ***************************************************************************
 """
+from builtins import zip
 
 __author__ = 'Martin Dobias'
 __date__ = 'January 2007'
@@ -31,7 +32,7 @@ def mapping_feature(feature):
     geom = feature.geometry()
     properties = {}
     fields = [field.name() for field in feature.fields()]
-    properties = dict(zip(fields, feature.attributes()))
+    properties = dict(list(zip(fields, feature.attributes())))
     return {'type': 'Feature',
             'properties': properties,
             'geometry': geom.__geo_interface__}

python/console/console.py

@@ -18,6 +18,8 @@
  ***************************************************************************/
 Some portions of code were taken from https://code.google.com/p/pydee/
 """
+from builtins import str
+from builtins import range
 import os
 
 from qgis.PyQt.QtCore import Qt, QTimer, QSettings, QCoreApplication, QSize, QByteArray, QFileInfo, QUrl, QDir
@@ -410,7 +412,7 @@ def __init__(self, parent=None):
         }
 
         self.classMenu = QMenu()
-        for (title, icon), commands in default_command.items():
+        for (title, icon), commands in list(default_command.items()):
             action = self.classMenu.addAction(icon, title)
             action.triggered.connect(partial(self.shell.commandConsole, commands))
 

python/console/console_editor.py

@@ -18,6 +18,9 @@
  ***************************************************************************/
 Some portions of code were taken from https://code.google.com/p/pydee/
 """
+from __future__ import print_function
+from builtins import str
+from builtins import range
 from qgis.PyQt.QtCore import Qt, QObject, QEvent, QSettings, QCoreApplication, QFileInfo, QSize
 from qgis.PyQt.QtGui import QFont, QFontMetrics, QColor, QKeySequence, QCursor
 from qgis.PyQt.QtWidgets import QShortcut, QMenu, QApplication, QWidget, QGridLayout, QSpacerItem, QSizePolicy, QFileDialog, QTabWidget, QTreeWidgetItem, QFrame, QLabel, QToolButton, QMessageBox
@@ -47,7 +50,7 @@ def __init__(self, window, tab, *args):
         self.window = window
         self.tab = tab
         self._handlers = {}
-        for shortcut, handler in KeyFilter.SHORTCUTS.items():
+        for shortcut, handler in list(KeyFilter.SHORTCUTS.items()):
             modifiers = shortcut[0]
             if not isinstance(modifiers, list):
                 modifiers = [modifiers]
@@ -1190,7 +1193,7 @@ def listObject(self, tab):
                             for superClass in class_data.super:
                                 if superClass == 'object':
                                     continue
-                                if isinstance(superClass, basestring):
+                                if isinstance(superClass, str):
                                     superClassName.append(superClass)
                                 else:
                                     superClassName.append(superClass.name)

python/console/console_output.py

@@ -18,6 +18,8 @@
  ***************************************************************************/
 Some portions of code were taken from https://code.google.com/p/pydee/
 """
+from builtins import range
+from builtins import object
 
 from qgis.PyQt.QtCore import Qt, QCoreApplication, QSettings
 from qgis.PyQt.QtGui import QColor, QFont, QKeySequence

python/console/console_sci.py

@@ -18,6 +18,8 @@
  ***************************************************************************/
 Some portions of code were taken from https://code.google.com/p/pydee/
 """
+from builtins import bytes
+from builtins import range
 
 from qgis.PyQt.QtCore import Qt, QSettings, QByteArray, QCoreApplication, QFile, QSize
 from qgis.PyQt.QtWidgets import QDialog, QMenu, QShortcut, QApplication

python/console/console_settings.py

@@ -18,6 +18,7 @@
  ***************************************************************************/
 Some portions of code were taken from https://code.google.com/p/pydee/
 """
+from builtins import range
 
 from qgis.PyQt.QtCore import QCoreApplication, QSize, QSettings, QFileInfo, Qt
 from qgis.PyQt.QtWidgets import QDialog, QFileDialog, QMessageBox, QTableWidgetItem