Fix 'bytes can only contain ASCII' error on python3

nyalldawson · m-kuhn · commit f5e4c9d6178b · 2017-01-19T08:43:49.000+01:00
diff --git a/src/python/qgspythonutilsimpl.cpp b/src/python/qgspythonutilsimpl.cpp
@@ -619,11 +619,11 @@ QString QgsPythonUtilsImpl::homePythonPath()
   QString settingsDir = QgsApplication::qgisSettingsDirPath();
   if ( QDir::cleanPath( settingsDir ) == QDir::homePath() + QStringLiteral( "/.qgis3" ) )
   {
-    return QStringLiteral( "b\"%1/.qgis3/python\".decode('utf-8')" ).arg( QDir::homePath() );
+    return QStringLiteral( "\"%1/.qgis3/python\"" ).arg( QDir::homePath() );
   }
   else
   {
-    return "b\"" + settingsDir.replace( '\\', QLatin1String( "\\\\" ) ) + "python\".decode('utf-8')";
+    return "\"" + settingsDir.replace( '\\', QLatin1String( "\\\\" ) ) + "python\"";
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -619,11 +619,11 @@ QString QgsPythonUtilsImpl::homePythonPath()`
`619`	`619`	`QString settingsDir = QgsApplication::qgisSettingsDirPath();`
`620`	`620`	`if ( QDir::cleanPath( settingsDir ) == QDir::homePath() + QStringLiteral( "/.qgis3" ) )`
`621`	`621`	`{`
`622`		`- return QStringLiteral( "b\"%1/.qgis3/python\".decode('utf-8')" ).arg( QDir::homePath() );`
	`622`	`+ return QStringLiteral( "\"%1/.qgis3/python\"" ).arg( QDir::homePath() );`
`623`	`623`	`}`
`624`	`624`	`else`
`625`	`625`	`{`
`626`		`- return "b\"" + settingsDir.replace( '\\', QLatin1String( "\\\\" ) ) + "python\".decode('utf-8')";`
	`626`	`+ return "\"" + settingsDir.replace( '\\', QLatin1String( "\\\\" ) ) + "python\"";`
`627`	`627`	`}`
`628`	`628`	`}`
`629`	`629`