From 5a3ddb76a7ac4ee6f41652f774e8387a8c9b131a Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Wed, 28 Dec 2011 09:28:18 -0500
Subject: typo

---
 pyramid/compat.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyramid/compat.py b/pyramid/compat.py
index 484cb7b97..12b8c9f37 100644
--- a/pyramid/compat.py
+++ b/pyramid/compat.py
@@ -33,7 +33,7 @@ else:
 
 def text_(s, encoding='latin-1', errors='strict'):
     """ If ``s`` is an instance of ``binary_type``, return
-    ``s.encode(encoding, errors)``, otherwise return ``s``"""
+    ``s.decode(encoding, errors)``, otherwise return ``s``"""
     if isinstance(s, binary_type):
         return s.decode(encoding, errors)
     return s # pragma: no cover
-- 
cgit v1.2.3