python's expanduser doesn't necessarily returns utf-8 (followup 4cb37b1)

jef-n · jef-n · commit 17fc3e90db0b · 2013-10-12T22:18:28.000+02:00
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -85,7 +85,7 @@ void QgsApplication::init( QString customConfigPath )
 {
   if ( customConfigPath.isEmpty() )
   {
-    customConfigPath = QDir::homePath() + QString( "/.qgis%1/" ).arg( 2 /* FIXME QGis::QGIS_VERSION_INT / 10000 */ );
+    customConfigPath = QString( "%1/.qgis%2/" ).arg( QDir::homePath() ).arg( QGis::QGIS_VERSION_INT / 10000 );
   }
 
   qRegisterMetaType<QgsGeometry::Error>( "QgsGeometry::Error" );
diff --git a/src/python/qgspythonutilsimpl.cpp b/src/python/qgspythonutilsimpl.cpp
@@ -487,9 +487,9 @@ QString QgsPythonUtilsImpl::pluginsPath()
 QString QgsPythonUtilsImpl::homePythonPath()
 {
   QString settingsDir = QgsApplication::qgisSettingsDirPath();
-  if ( QDir::cleanPath( settingsDir ) == QDir::homePath() + QString( "/.qgis%1" ).arg( 2 /* FIXME QGis::QGIS_VERSION_INT / 10000 */ ) )
+  if ( QDir::cleanPath( settingsDir ) == QDir::homePath() + QString( "/.qgis%1" ).arg( QGis::QGIS_VERSION_INT / 10000 ) )
   {
-    return QString( "os.path.expanduser(\"~/.qgis%1/python\").decode('utf-8')" ).arg( 2 /* FIXME: QGis::QGIS_VERSION_INT / 10000 */ );
+    return QString( "\"%1/.qgis%2/python\".decode('utf-8')" ).arg( QDir::homePath() ).arg( QGis::QGIS_VERSION_INT / 10000 );
   }
   else
   {

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ void QgsApplication::init( QString customConfigPath )`
`85`	`85`	`{`
`86`	`86`	`if ( customConfigPath.isEmpty() )`
`87`	`87`	`{`
`88`		`- customConfigPath = QDir::homePath() + QString( "/.qgis%1/" ).arg( 2 /* FIXME QGis::QGIS_VERSION_INT / 10000 */ );`
	`88`	`+ customConfigPath = QString( "%1/.qgis%2/" ).arg( QDir::homePath() ).arg( QGis::QGIS_VERSION_INT / 10000 );`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`qRegisterMetaType<QgsGeometry::Error>( "QgsGeometry::Error" );`
Original file line number	Diff line number	Diff line change
`@@ -487,9 +487,9 @@ QString QgsPythonUtilsImpl::pluginsPath()`
`487`	`487`	`QString QgsPythonUtilsImpl::homePythonPath()`
`488`	`488`	`{`
`489`	`489`	`QString settingsDir = QgsApplication::qgisSettingsDirPath();`
`490`		`- if ( QDir::cleanPath( settingsDir ) == QDir::homePath() + QString( "/.qgis%1" ).arg( 2 /* FIXME QGis::QGIS_VERSION_INT / 10000 */ ) )`
	`490`	`+ if ( QDir::cleanPath( settingsDir ) == QDir::homePath() + QString( "/.qgis%1" ).arg( QGis::QGIS_VERSION_INT / 10000 ) )`
`491`	`491`	`{`
`492`		`- return QString( "os.path.expanduser(\"~/.qgis%1/python\").decode('utf-8')" ).arg( 2 /* FIXME: QGis::QGIS_VERSION_INT / 10000 */ );`
	`492`	`+ return QString( "\"%1/.qgis%2/python\".decode('utf-8')" ).arg( QDir::homePath() ).arg( QGis::QGIS_VERSION_INT / 10000 );`
`493`	`493`	`}`
`494`	`494`	`else`
`495`	`495`	`{`