Merge remote-tracking branch 'origin/master'

Author: andrivet

docs/examples.rst

@@ -111,12 +111,12 @@ The main function is ``pretty_print``:
         """Pretty print ASN.1 data."""
         while not input_stream.eof():
             tag = input_stream.peek()
-            if tag.typ == asn1.TypePrimitive:
+            if tag.typ == asn1.Types.Primitive:
                 tag, value = input_stream.read()
                 output_stream.write(' ' * indent)
                 output_stream.write('[{}] {}: {}\n'.format(class_id_to_string(tag.cls),
                     tag_id_to_string(tag.nr), value_to_string(tag.nr, value)))
-            elif tag.typ == asn1.TypeConstructed:
+            elif tag.typ == asn1.Types.Constructed:
                 output_stream.write(' ' * indent)
                 output_stream.write('[{}] {}\n'.format(class_id_to_string(tag.cls),
                     tag_id_to_string(tag.nr)))