rcc - fix problem with non-utf8 characters in header + pysideuic - py3k port. Original author Miroslav Jezek.

Author: lck

CMakeLists.txt

@@ -18,8 +18,9 @@ option(BUILD_TESTS "Build tests." TRUE)
 # UIC stuff
 if (NOT SITE_PACKAGE)
     execute_process(
-        COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; \\
-            print sysconfig.get_python_lib(1,0,prefix='${CMAKE_INSTALL_PREFIX}')"
+        COMMAND ${PYTHON_EXECUTABLE} -c "from __future__ import print_function; \\
+            from distutils import sysconfig; \\
+            print(sysconfig.get_python_lib(1,0,prefix='${CMAKE_INSTALL_PREFIX}'))"
         OUTPUT_VARIABLE SITE_PACKAGE
     OUTPUT_STRIP_TRAILING_WHITESPACE)
     if (NOT SITE_PACKAGE)

pylupdate/main.cpp

@@ -101,34 +101,6 @@ static void updateTsFiles( const MetaTranslator& fetchedTor,
     }
 }
 
-/* The filename may contain double quotes when passing filenames with
- * whitespaces. So we need to make it proper to be called with fopen()
- * function. Handle them properly.
-*/
-static inline const QStringList parseFileNames(const QString& line)
-{
-    QStringList retval;
-
-    QString s;
-    unsigned int count = 0;
-    foreach(QChar c, line) {
-        if (c == '"') { /* we're still walking through the path... */
-            count++;
-        } else if (c.isSpace() && !(count % 2)) { /* path is done! */
-            /* append it to our list */
-            retval << s;
-            s.clear();
-        } else {
-            s += c;
-        }
-    }
-
-    if (s.size())
-        retval << s; /* append the last path to our list */
-
-    return retval;
-}
-
 int main( int argc, char **argv )
 {
     QString defaultContext = "@default";
@@ -208,9 +180,9 @@ int main( int argc, char **argv )
             QMap<QString, QString>::Iterator it;
 
             for ( it = tagMap.begin(); it != tagMap.end(); ++it ) {
-                QStringList toks = parseFileNames(it.value());
-
+                QStringList toks = it.value().split(' ');
                 QStringList::Iterator t;
+
                 for ( t = toks.begin(); t != toks.end(); ++t ) {
                     if ( it.key() == "SOURCES" ) {
                         fetchtr_py( (*t).toAscii(), &fetchedTor, defaultContext.toAscii(), true, codecForSource );

pyrcc/rcc.cpp

@@ -398,7 +398,7 @@ RCCResourceLibrary::writeHeader(FILE *out)
     fprintf(out, "# -*- coding: utf-8 -*-\n\n");
     fprintf(out, "# Resource object code\n");
     fprintf(out, "#\n");
-    fprintf(out, "# Created: %s\n", QDateTime::currentDateTime().toString().toLatin1().constData());
+    fprintf(out, "# Created: %s\n", QDateTime::currentDateTime().toString().toUtf8().constData());
     fprintf(out, "#      by: The Resource Compiler for PySide (Qt v%s)\n", QT_VERSION_STR);
     fprintf(out, "#\n");
     fprintf(out, "# WARNING! All changes made in this file will be lost!\n");

pyside-uic

@@ -32,7 +32,10 @@ from pysideuic import __version__ as PySideUicVersion
 Version = "PySide User Interface Compiler version %s, running on PySide %s." % (PySideUicVersion, PySideVersion)
 
 def main():
-    from pysideuic.port_v2.invoke import invoke
+    if sys.hexversion >= 0x03000000:
+        from pysideuic.port_v3.invoke import invoke
+    else:
+        from pysideuic.port_v2.invoke import invoke
 
     parser = optparse.OptionParser(usage="pyside-uic [options] <ui-file>",
             version=Version)

pysideuic/Compiler/qtproxies.py

@@ -27,8 +27,12 @@
 from pysideuic.Compiler.indenter import write_code
 from pysideuic.Compiler.misc import Literal, moduleMember
 
-from pysideuic.port_v2.proxy_base import ProxyBase
-from pysideuic.port_v2.as_string import as_string
+if sys.hexversion >= 0x03000000:
+    from pysideuic.port_v3.proxy_base import ProxyBase
+    from pysideuic.port_v3.as_string import as_string
+else:
+    from pysideuic.port_v2.proxy_base import ProxyBase
+    from pysideuic.port_v2.as_string import as_string
 
 i18n_strings = []
 i18n_context = ""

pysideuic/objcreator.py

@@ -24,7 +24,11 @@
 import os.path
 
 from pysideuic.exceptions import NoSuchWidgetError, WidgetPluginError
-from port_v2.load_plugin import load_plugin
+
+if sys.hexversion >= 0x03000000:
+    from pysideuic.port_v3.load_plugin import load_plugin
+else:
+    from pysideuic.port_v2.load_plugin import load_plugin
 
 
 # The list of directories that are searched for widget plugins.  This is

pysideuic/port_v3/__init__.py

@@ -0,0 +1,20 @@
+# This file is part of the PySide project.
+#
+# Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (C) 2010 Riverbank Computing Limited.
+#
+# Contact: PySide team <[email protected]>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# version 2 as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA

pysideuic/port_v3/as_string.py

@@ -0,0 +1,41 @@
+# This file is part of the PySide project.
+#
+# Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (C) 2010 Riverbank Computing Limited.
+#
+# Contact: PySide team <[email protected]>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# version 2 as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA
+
+import re
+
+
+def as_string(obj, encode=True):
+    if isinstance(obj, str):
+        s = '"' + _escape(obj) + '"'
+        
+        return s
+
+    return str(obj)
+
+
+_esc_regex = re.compile(r"(\"|\'|\\)")
+
+def _escape(text):
+    # This escapes any escaped single or double quote or backslash.
+    x = _esc_regex.sub(r"\\\1", text)
+
+    # This replaces any '\n' with an escaped version and a real line break.
+    return re.sub(r'\n', r'\\n"\n"', x)

pysideuic/port_v3/ascii_upper.py

@@ -0,0 +1,30 @@
+# This file is part of the PySide project.
+#
+# Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (C) 2010 Riverbank Computing Limited.
+#
+# Contact: PySide team <[email protected]>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# version 2 as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA
+
+
+# A translation table for converting ASCII lower case to upper case.
+_ascii_trans_table = bytes.maketrans(b'abcdefghijklmnopqrstuvwxyz',
+        b'ABCDEFGHIJKLMNOPQRSTUVWXYZ')
+
+
+# Convert a string to ASCII upper case irrespective of the current locale.
+def ascii_upper(s):
+    return s.translate(_ascii_trans_table)

pysideuic/port_v3/invoke.py

@@ -0,0 +1,48 @@
+# This file is part of the PySide project.
+#
+# Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (C) 2010 Riverbank Computing Limited.
+# Copyright (C) 2009 Torsten Marek
+#
+# Contact: PySide team <[email protected]>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# version 2 as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA
+
+from pysideuic.exceptions import NoSuchWidgetError
+
+
+def invoke(driver):
+    """ Invoke the given command line driver.  Return the exit status to be
+    passed back to the parent process.
+    """
+
+    exit_status = 1
+
+    try:
+        exit_status = driver.invoke()
+
+    except IOError as e:
+        driver.on_IOError(e)
+
+    except SyntaxError as e:
+        driver.on_SyntaxError(e)
+
+    except NoSuchWidgetError as e:
+        driver.on_NoSuchWidgetError(e)
+
+    except Exception as e:
+        driver.on_Exception(e)
+
+    return exit_status