new string escaping logic for python

qgis · Sep 24, 2021 · e873dd3 · e873dd3
1 parent 968db20
commit e873dd3
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/core/processing/qgsprocessingutils.cpp b/src/core/processing/qgsprocessingutils.cpp
@@ -704,9 +704,16 @@ QString QgsProcessingUtils::stringToPythonLiteral( const QString &string )
   s.replace( '\n', QLatin1String( "\\n" ) );
   s.replace( '\r', QLatin1String( "\\r" ) );
   s.replace( '\t', QLatin1String( "\\t" ) );
-  s.replace( '"', QLatin1String( "\\\"" ) );
-  s.replace( '\'', QLatin1String( "\\\'" ) );
-  s = s.prepend( '\'' ).append( '\'' );
+
+  if ( s.contains( '\'' ) && !s.contains( '\"' ) )
+  {
+    s = s.prepend( '"' ).append( '"' );
+  }
+  else
+  {
+    s.replace( '\'', QLatin1String( "\\\'" ) );
+    s = s.prepend( '\'' ).append( '\'' );
+  }
   return s;
 }