Move the two lines to the end of the format_sql method.

Masse · Masse · commit f0188dedc8ac · 2017-04-04T15:10:55.000-04:00
diff --git a/django_pyodbc/base.py b/django_pyodbc/base.py
@@ -454,6 +454,8 @@ def format_sql(self, sql, n_params=None):
         else:
             if '%s' in sql:
                 sql = sql.replace('%s', '?')
+        if sys.version.startswith('3') and type(sql) is not str:
+            sql = sql.decode(self.encoding or sys.stdout.encoding)
         return sql
 
     def format_params(self, params):
@@ -483,8 +485,6 @@ def format_params(self, params):
     def execute(self, sql, params=()):
         self.last_sql = sql
         sql = self.format_sql(sql, len(params))
-        if sys.version.startswith('3') and type(sql) is not str:
-            sql = sql.decode(sys.stdout.encoding)
         params = self.format_params(params)
         self.last_params = params
         try:
