[pypy-commit] pypy default: rename forceencoded to tryencode (as suggested by bdkearns)

[krono]

Author: Tobias Pape <tob...@netshed.de>
Branch: 
Changeset: r61996:3da1c6270c53
Date: 2013-03-04 10:27 +0100
http://bitbucket.org/pypy/pypy/changeset/3da1c6270c53/

Log:    rename forceencoded to tryencode (as suggested by bdkearns)

diff --git a/dotviewer/msgstruct.py b/dotviewer/msgstruct.py
--- a/dotviewer/msgstruct.py
+++ b/dotviewer/msgstruct.py
@@ -1,6 +1,6 @@
 import sys, os
 from struct import pack, unpack, calcsize
-from strunicode import forceencoded
+from strunicode import tryencode
 
 MAGIC = -0x3b83728b
 
@@ -28,7 +28,7 @@
 def message(tp, *values):
     #print >> sys.stderr, tp, values
     typecodes = ['']
-    values = map(forceencoded, values)
+    values = map(tryencode, values)
     for v in values:
         if type(v) is str:
             typecodes.append('%ds' % len(v))
diff --git a/dotviewer/strunicode.py b/dotviewer/strunicode.py
--- a/dotviewer/strunicode.py
+++ b/dotviewer/strunicode.py
@@ -10,6 +10,6 @@
     """ returns `name` as (possibly `RAW_ENCODING` encoded) string, even if it 
wasn't before  """
     return name if isinstance(name, str) else name.encode(RAW_ENCODING, 
ENCODING_ERROR_HANDLING)
 
-def forceencoded(name):
+def tryencode(name):
     """ returns `name` as encoded string if it was unicode before """
     return name.encode(RAW_ENCODING, ENCODING_ERROR_HANDLING) if 
isinstance(name, unicode) else name
diff --git a/dotviewer/test/test_unicode_util.py 
b/dotviewer/test/test_unicode_util.py
--- a/dotviewer/test/test_unicode_util.py
+++ b/dotviewer/test/test_unicode_util.py
@@ -3,7 +3,7 @@
 #
 import py
 import codecs
-from dotviewer.strunicode import RAW_ENCODING, forcestr, forceunicode, 
forceencoded
+from dotviewer.strunicode import RAW_ENCODING, forcestr, forceunicode, 
tryencode
 
 SOURCE1 = u"""digraph G{
 &#955; -> b
@@ -61,7 +61,7 @@
         sut =      [1,   u"a", "miau", u"&#955;"]
         expected = [int, str,  str   , str ]
 
-        results = map(forceencoded, sut)
+        results = map(tryencode, sut)
 
 
         for result, expected_type in zip(results, expected):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit