Merge "hacking: Remove references to encoding"

1 files changed, 1 insertions, 47 deletions

diff --git a/HACKING.rst b/HACKING.rst
index b5fbad3c..432d19f4 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -32,7 +32,7 @@ use the alternate 4 space indent.  With the first argument on the succeeding
 line all arguments will then be vertically aligned.  Use the same convention
 used with other data structure literals and terminate the method call with
 the last argument line ending with a comma and the closing paren on its own
-line indented to the starting line level.
+line indented to the starting line level.  ::
 
     unnecessarily_long_function_name(
         'string one',
@@ -40,49 +40,3 @@ line indented to the starting line level.
         kwarg1=constants.ACTIVE,
         kwarg2=['a', 'b', 'c'],
     )
-
-Text encoding
--------------
-
-Note: this section clearly has not been implemented in this project yet, it is
-the intention to do so.
-
-All text within python code should be of type 'unicode'.
-
-    WRONG:
-
-    >>> s = 'foo'
-    >>> s
-    'foo'
-    >>> type(s)
-    <type 'str'>
-
-    RIGHT:
-
-    >>> u = u'foo'
-    >>> u
-    u'foo'
-    >>> type(u)
-    <type 'unicode'>
-
-Transitions between internal unicode and external strings should always
-be immediately and explicitly encoded or decoded.
-
-All external text that is not explicitly encoded (database storage,
-commandline arguments, etc.) should be presumed to be encoded as utf-8.
-
-    WRONG:
-
-    infile = open('testfile', 'r')
-    mystring = infile.readline()
-    myreturnstring = do_some_magic_with(mystring)
-    outfile.write(myreturnstring)
-
-    RIGHT:
-
-    infile = open('testfile', 'r')
-    mystring = infile.readline()
-    mytext = mystring.decode('utf-8')
-    returntext = do_some_magic_with(mytext)
-    returnstring = returntext.encode('utf-8')
-    outfile.write(returnstring)