From fa33edb95de2e8ecaad982e8e5f76d91e3ed73b1 Mon Sep 17 00:00:00 2001 From: elie Date: Sun, 15 Nov 2015 07:38:48 +0000 Subject: copyright notice added --- CHANGES.txt | 4 ++-- pyasn1/codec/ber/decoder.py | 6 ++++++ pyasn1/codec/ber/encoder.py | 6 ++++++ pyasn1/codec/ber/eoo.py | 6 ++++++ pyasn1/codec/cer/decoder.py | 6 ++++++ pyasn1/codec/cer/encoder.py | 6 ++++++ pyasn1/codec/der/decoder.py | 6 ++++++ pyasn1/codec/der/encoder.py | 6 ++++++ pyasn1/compat/binary.py | 6 ++++++ pyasn1/compat/octets.py | 6 ++++++ pyasn1/debug.py | 6 ++++++ pyasn1/error.py | 6 ++++++ pyasn1/type/base.py | 6 ++++++ pyasn1/type/char.py | 6 ++++++ pyasn1/type/constraint.py | 21 +++++++++++++-------- pyasn1/type/error.py | 6 ++++++ pyasn1/type/namedtype.py | 7 +++++++ pyasn1/type/namedval.py | 7 +++++++ pyasn1/type/tag.py | 7 +++++++ pyasn1/type/tagmap.py | 6 ++++++ pyasn1/type/univ.py | 7 +++++++ pyasn1/type/useful.py | 7 +++++++ setup.py | 18 ++++++++---------- test/codec/ber/suite.py | 6 ++++++ test/codec/ber/test_decoder.py | 6 ++++++ test/codec/ber/test_encoder.py | 6 ++++++ test/codec/cer/suite.py | 6 ++++++ test/codec/cer/test_decoder.py | 6 ++++++ test/codec/cer/test_encoder.py | 6 ++++++ test/codec/der/suite.py | 6 ++++++ test/codec/der/test_decoder.py | 6 ++++++ test/codec/der/test_encoder.py | 6 ++++++ test/codec/suite.py | 6 ++++++ test/suite.py | 6 ++++++ test/type/suite.py | 6 ++++++ test/type/test_constraint.py | 6 ++++++ test/type/test_namedtype.py | 6 ++++++ test/type/test_namedval.py | 6 ++++++ test/type/test_tag.py | 6 ++++++ test/type/test_univ.py | 6 ++++++ 40 files changed, 250 insertions(+), 20 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 2e91f72..5a1dd45 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,7 +1,7 @@ -Revision 0.1.10, released 10-10-2015 +Revision 0.1.10, released 20-11-2015 ------------------------------------ -- Fix to __doc__ use in setup.py to make -O0 installation mode working. +- Copyright notice added to non-trivial source code files. Revision 0.1.9, released 28-09-2015 ----------------------------------- diff --git a/pyasn1/codec/ber/decoder.py b/pyasn1/codec/ber/decoder.py index 61bfbce..81812cb 100644 --- a/pyasn1/codec/ber/decoder.py +++ b/pyasn1/codec/ber/decoder.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# # BER decoder from pyasn1.type import tag, univ, char, useful, tagmap from pyasn1.codec.ber import eoo diff --git a/pyasn1/codec/ber/encoder.py b/pyasn1/codec/ber/encoder.py index 0fb4ae7..c46d254 100644 --- a/pyasn1/codec/ber/encoder.py +++ b/pyasn1/codec/ber/encoder.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# # BER encoder from pyasn1.type import base, tag, univ, char, useful from pyasn1.codec.ber import eoo diff --git a/pyasn1/codec/ber/eoo.py b/pyasn1/codec/ber/eoo.py index 379be19..d29d96f 100644 --- a/pyasn1/codec/ber/eoo.py +++ b/pyasn1/codec/ber/eoo.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# from pyasn1.type import base, tag class EndOfOctets(base.AbstractSimpleAsn1Item): diff --git a/pyasn1/codec/cer/decoder.py b/pyasn1/codec/cer/decoder.py index 1770cd8..ce88263 100644 --- a/pyasn1/codec/cer/decoder.py +++ b/pyasn1/codec/cer/decoder.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# # CER decoder from pyasn1.type import univ from pyasn1.codec.ber import decoder diff --git a/pyasn1/codec/cer/encoder.py b/pyasn1/codec/cer/encoder.py index 61ce8a1..34ad6e4 100644 --- a/pyasn1/codec/cer/encoder.py +++ b/pyasn1/codec/cer/encoder.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# # CER encoder from pyasn1.type import univ from pyasn1.type import useful diff --git a/pyasn1/codec/der/decoder.py b/pyasn1/codec/der/decoder.py index ea58d6d..f491df6 100644 --- a/pyasn1/codec/der/decoder.py +++ b/pyasn1/codec/der/decoder.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# # DER decoder from pyasn1.codec.cer import decoder diff --git a/pyasn1/codec/der/encoder.py b/pyasn1/codec/der/encoder.py index 7f55eeb..052e2bd 100644 --- a/pyasn1/codec/der/encoder.py +++ b/pyasn1/codec/der/encoder.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# # DER encoder from pyasn1.type import univ from pyasn1.codec.cer import encoder diff --git a/pyasn1/compat/binary.py b/pyasn1/compat/binary.py index b38932a..2b98492 100644 --- a/pyasn1/compat/binary.py +++ b/pyasn1/compat/binary.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# from sys import version_info if version_info[0:2] < (2, 6): diff --git a/pyasn1/compat/octets.py b/pyasn1/compat/octets.py index e812737..cec8305 100644 --- a/pyasn1/compat/octets.py +++ b/pyasn1/compat/octets.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# from sys import version_info if version_info[0] <= 2: diff --git a/pyasn1/debug.py b/pyasn1/debug.py index 9b69886..d594b90 100644 --- a/pyasn1/debug.py +++ b/pyasn1/debug.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# import time import logging from pyasn1.compat.octets import octs2ints diff --git a/pyasn1/error.py b/pyasn1/error.py index 716406f..097fb67 100644 --- a/pyasn1/error.py +++ b/pyasn1/error.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# class PyAsn1Error(Exception): pass class ValueConstraintError(PyAsn1Error): pass class SubstrateUnderrunError(PyAsn1Error): pass diff --git a/pyasn1/type/base.py b/pyasn1/type/base.py index 72920a9..c5c18ec 100644 --- a/pyasn1/type/base.py +++ b/pyasn1/type/base.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# # Base classes for ASN.1 types import sys from pyasn1.type import constraint, tagmap, tag diff --git a/pyasn1/type/char.py b/pyasn1/type/char.py index af49ab3..46b3eac 100644 --- a/pyasn1/type/char.py +++ b/pyasn1/type/char.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# # ASN.1 "character string" types from pyasn1.type import univ, tag diff --git a/pyasn1/type/constraint.py b/pyasn1/type/constraint.py index 6687393..8e468fd 100644 --- a/pyasn1/type/constraint.py +++ b/pyasn1/type/constraint.py @@ -1,15 +1,20 @@ # -# ASN.1 subtype constraints classes. +# This file is part of pyasn1 software. # -# Constraints are relatively rare, but every ASN1 object -# is doing checks all the time for whether they have any -# constraints and whether they are applicable to the object. +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html # -# What we're going to do is define objects/functions that -# can be called unconditionally if they are present, and that -# are simply not present if there are no constraints. +# ASN.1 subtype constraints classes. # -# Original concept and code by Mike C. Fletcher. +# Constraints are relatively rare, but every ASN1 object +# is doing checks all the time for whether they have any +# constraints and whether they are applicable to the object. +# +# What we're going to do is define objects/functions that +# can be called unconditionally if they are present, and that +# are simply not present if there are no constraints. +# +# Original concept and code by Mike C. Fletcher. # import sys from pyasn1.type import error diff --git a/pyasn1/type/error.py b/pyasn1/type/error.py index 3e68484..b2978d7 100644 --- a/pyasn1/type/error.py +++ b/pyasn1/type/error.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# from pyasn1.error import PyAsn1Error class ValueConstraintError(PyAsn1Error): pass diff --git a/pyasn1/type/namedtype.py b/pyasn1/type/namedtype.py index aca4282..25a33bf 100644 --- a/pyasn1/type/namedtype.py +++ b/pyasn1/type/namedtype.py @@ -1,4 +1,11 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# # NamedType specification for constructed types +# import sys from pyasn1.type import tagmap from pyasn1 import error diff --git a/pyasn1/type/namedval.py b/pyasn1/type/namedval.py index 676cb93..9de432a 100644 --- a/pyasn1/type/namedval.py +++ b/pyasn1/type/namedval.py @@ -1,4 +1,11 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# # ASN.1 named integers +# from pyasn1 import error __all__ = [ 'NamedValues' ] diff --git a/pyasn1/type/tag.py b/pyasn1/type/tag.py index 7471a9b..cf4cf95 100644 --- a/pyasn1/type/tag.py +++ b/pyasn1/type/tag.py @@ -1,4 +1,11 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# # ASN.1 types tags +# from operator import getitem from pyasn1 import error diff --git a/pyasn1/type/tagmap.py b/pyasn1/type/tagmap.py index feb91ae..b04c161 100644 --- a/pyasn1/type/tagmap.py +++ b/pyasn1/type/tagmap.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# from pyasn1 import error class TagMap: diff --git a/pyasn1/type/univ.py b/pyasn1/type/univ.py index 4ed640f..7beb4b2 100644 --- a/pyasn1/type/univ.py +++ b/pyasn1/type/univ.py @@ -1,4 +1,11 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# # ASN.1 "universal" data types +# import operator, sys, math from pyasn1.type import base, tag, constraint, namedtype, namedval, tagmap from pyasn1.codec.ber import eoo diff --git a/pyasn1/type/useful.py b/pyasn1/type/useful.py index 1766534..3a77157 100644 --- a/pyasn1/type/useful.py +++ b/pyasn1/type/useful.py @@ -1,4 +1,11 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# # ASN.1 "useful" types +# from pyasn1.type import char, tag class ObjectDescriptor(char.GraphicString): diff --git a/setup.py b/setup.py index 2bac77c..40daa0f 100644 --- a/setup.py +++ b/setup.py @@ -1,9 +1,10 @@ #!/usr/bin/env python -"""ASN.1 types and codecs - - A pure-Python implementation of ASN.1 types and DER/BER/CER codecs (X.208). -""" - +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# import os import sys @@ -55,14 +56,11 @@ except ImportError: from distutils.core import setup, Command params = {} -doclines = [x.strip() for x in (__doc__ or '').split('\n') if x] - - params.update({ 'name': 'pyasn1', 'version': open(os.path.join('pyasn1','__init__.py')).read().split('\'')[1], - 'description': doclines[0], - 'long_description': ' '.join(doclines[1:]), + 'description': 'ASN.1 types and codecs', + 'long_description': 'Pure-Python implementation of ASN.1 types and DER/BER/CER codecs (X.208)', 'maintainer': 'Ilya Etingof ', 'author': 'Ilya Etingof', 'author_email': 'ilya@glas.net', diff --git a/test/codec/ber/suite.py b/test/codec/ber/suite.py index 796c526..73c85c3 100644 --- a/test/codec/ber/suite.py +++ b/test/codec/ber/suite.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# from sys import path, version_info from os.path import sep path.insert(1, path[0]+sep+'ber') diff --git a/test/codec/ber/test_decoder.py b/test/codec/ber/test_decoder.py index f52997a..468c1be 100644 --- a/test/codec/ber/test_decoder.py +++ b/test/codec/ber/test_decoder.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# from pyasn1.type import tag, namedtype, univ, char from pyasn1.codec.ber import decoder, eoo from pyasn1.compat.octets import ints2octs, str2octs, null diff --git a/test/codec/ber/test_encoder.py b/test/codec/ber/test_encoder.py index cd064b6..ff732b4 100644 --- a/test/codec/ber/test_encoder.py +++ b/test/codec/ber/test_encoder.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# from pyasn1.type import tag, namedtype, univ, char from pyasn1.codec.ber import encoder from pyasn1.compat.octets import ints2octs diff --git a/test/codec/cer/suite.py b/test/codec/cer/suite.py index 49d6829..1777b2f 100644 --- a/test/codec/cer/suite.py +++ b/test/codec/cer/suite.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# from sys import path, version_info from os.path import sep path.insert(1, path[0]+sep+'cer') diff --git a/test/codec/cer/test_decoder.py b/test/codec/cer/test_decoder.py index 9d793a3..e8c7544 100644 --- a/test/codec/cer/test_decoder.py +++ b/test/codec/cer/test_decoder.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# from pyasn1.type import univ from pyasn1.codec.cer import decoder from pyasn1.compat.octets import ints2octs, str2octs, null diff --git a/test/codec/cer/test_encoder.py b/test/codec/cer/test_encoder.py index 4ce0ffd..4e63f1d 100644 --- a/test/codec/cer/test_encoder.py +++ b/test/codec/cer/test_encoder.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# from pyasn1.type import namedtype, univ, useful from pyasn1.codec.cer import encoder from pyasn1.compat.octets import ints2octs diff --git a/test/codec/der/suite.py b/test/codec/der/suite.py index 7af83bf..a0dd589 100644 --- a/test/codec/der/suite.py +++ b/test/codec/der/suite.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# from sys import path, version_info from os.path import sep path.insert(1, path[0]+sep+'der') diff --git a/test/codec/der/test_decoder.py b/test/codec/der/test_decoder.py index 5f0bc0b..9984f7c 100644 --- a/test/codec/der/test_decoder.py +++ b/test/codec/der/test_decoder.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# from pyasn1.type import univ from pyasn1.codec.der import decoder from pyasn1.compat.octets import ints2octs diff --git a/test/codec/der/test_encoder.py b/test/codec/der/test_encoder.py index d5cd9b9..2aedb98 100644 --- a/test/codec/der/test_encoder.py +++ b/test/codec/der/test_encoder.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# from pyasn1.type import namedtype, univ from pyasn1.codec.der import encoder from pyasn1.compat.octets import ints2octs diff --git a/test/codec/suite.py b/test/codec/suite.py index 93ff063..6ee0bed 100644 --- a/test/codec/suite.py +++ b/test/codec/suite.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# from sys import path, version_info from os.path import sep path.insert(1, path[0]+sep+'codec'+sep+'ber') diff --git a/test/suite.py b/test/suite.py index b4d80e8..e949561 100644 --- a/test/suite.py +++ b/test/suite.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# from sys import path, version_info from os.path import sep path.insert(1, path[0]+sep+'type') diff --git a/test/type/suite.py b/test/type/suite.py index bc4b486..6972c83 100644 --- a/test/type/suite.py +++ b/test/type/suite.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# import test_tag, test_constraint, test_namedtype, test_univ from pyasn1.error import PyAsn1Error from sys import version_info diff --git a/test/type/test_constraint.py b/test/type/test_constraint.py index 3457c0f..9bf852f 100644 --- a/test/type/test_constraint.py +++ b/test/type/test_constraint.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# from pyasn1.type import constraint, error from pyasn1.error import PyAsn1Error from sys import version_info diff --git a/test/type/test_namedtype.py b/test/type/test_namedtype.py index f94f542..f18e301 100644 --- a/test/type/test_namedtype.py +++ b/test/type/test_namedtype.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# from pyasn1.type import namedtype, univ from pyasn1.error import PyAsn1Error from sys import version_info diff --git a/test/type/test_namedval.py b/test/type/test_namedval.py index 664348f..2db501c 100644 --- a/test/type/test_namedval.py +++ b/test/type/test_namedval.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# from pyasn1.type import namedval from pyasn1.error import PyAsn1Error from sys import version_info diff --git a/test/type/test_tag.py b/test/type/test_tag.py index a9c4005..bcaef8a 100644 --- a/test/type/test_tag.py +++ b/test/type/test_tag.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# from pyasn1.type import tag from pyasn1.error import PyAsn1Error from sys import version_info diff --git a/test/type/test_univ.py b/test/type/test_univ.py index 5eaa8e1..ce00193 100644 --- a/test/type/test_univ.py +++ b/test/type/test_univ.py @@ -1,3 +1,9 @@ +# +# This file is part of pyasn1 software. +# +# Copyright (c) 2005-2015, Ilya Etingof +# License: http://pyasn1.sf.net/license.html +# from pyasn1.type import univ, tag, constraint, namedtype, namedval, error from pyasn1.compat.octets import str2octs, ints2octs from pyasn1.error import PyAsn1Error -- cgit v1.2.1