Treat \r as whitespace too, when removing trailing whitespace

diff --git a/Lib/quopri.py b/Lib/quopri.py
index b449792e402a2ec41013831fd7b984933bc207c5..82f4727dd1273127078a16b8980e44f699a81dca 100755 (executable)
--- a/Lib/quopri.py
+++ b/Lib/quopri.py
@@ -63,7 +63,7 @@ def decode(input, output):
         if n > 0 and line[n-1] == '\n':
             partial = 0; n = n-1
             # Strip trailing whitespace
-            while n > 0 and line[n-1] in (' ', '\t'):
+            while n > 0 and line[n-1] in " \t\r":
                 n = n-1
         else:
             partial = 1