summaryrefslogtreecommitdiff
path: root/webob/descriptors.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-03-20 23:25:37 -0400
committerChris McDonough <chrism@plope.com>2011-03-20 23:25:37 -0400
commitd8176e7279e19ab3e618056555a05d710bb161d4 (patch)
tree43717841fd1326d22a4aaea2d1a17c1c0ce72fcb /webob/descriptors.py
parent1c4912af221e89ecf117154e2708f58984287ad8 (diff)
parentc3f021fbf2fd027b0778ca9dadc79ae7b2a5394b (diff)
downloadwebob-tests.pycon2011.tar.gz
merge from headtests.pycon2011
Diffstat (limited to 'webob/descriptors.py')
-rw-r--r--webob/descriptors.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/webob/descriptors.py b/webob/descriptors.py
index d037ebc..f1a5eeb 100644
--- a/webob/descriptors.py
+++ b/webob/descriptors.py
@@ -1,5 +1,7 @@
+# -*- coding: utf-8 -*-
+
import warnings
-import re, textwrap
+import re
from datetime import datetime, date
from webob.byterange import Range, ContentRange
@@ -76,9 +78,10 @@ def header_getter(header, rfc_section):
def converter(prop, parse, serialize, convert_name=None):
assert isinstance(prop, property)
- convert_name = convert_name or "%r and %r" % (parse, serialize)
+ convert_name = convert_name or "%r and %r" % (parse.__name__,
+ serialize.__name__)
doc = prop.__doc__ or ''
- doc += " Converts it as a %s." % convert_name
+ doc += " Converts it using %s." % convert_name
hget, hset = prop.fget, prop.fset
def fget(r):
return parse(hget(r))