Merge pull request #117 from iotaledger/feature/62-properBytesFromTrytes

Fixed incorrect documentation.

Author: todofixthis

iota/types.py

@@ -77,9 +77,9 @@ def from_bytes(cls, bytes_, codec=AsciiTrytesCodec.name, *args, **kwargs):
     :param codec:
       Which codec to use:
 
-        - 'binary': Converts each byte into a sequence of trits with
-          the same value (this is usually what you want).
-        - 'ascii': Uses the legacy ASCII codec.
+        - 'trytes_binary': Converts each byte into a sequence of trits
+          with the same value (this is usually what you want).
+        - 'trytes_ascii': Uses the legacy ASCII codec.
 
     :param args:
       Additional positional arguments to pass to the initializer.
@@ -458,9 +458,9 @@ def as_bytes(self, errors='strict', codec=AsciiTrytesCodec.name):
     :param codec:
       Which codec to use:
 
-      - 'binary': Converts each sequence of 5 trits into a byte with
-        the same value (this is usually what you want).
-      - 'ascii': Uses the legacy ASCII codec.
+      - 'trytes_binary': Converts each sequence of 5 trits into a byte
+        with the same value (this is usually what you want).
+      - 'trytes_ascii': Uses the legacy ASCII codec.
 
     :raise:
       - :py:class:`iota.codecs.TrytesDecodeError` if the trytes cannot