Misc fix on code style

Author: zjkmxy

docs/conf.py

@@ -19,7 +19,7 @@
 # -- Project information -----------------------------------------------------
 
 project = 'python-ndn'
-copyright = '2019, Xinyu Ma'
+copyright = '2019-2020, The python-ndn authors'
 author = 'Xinyu Ma'
 
 # The full version, including alpha/beta/rc tags

docs/src/contribute_support.rst

@@ -2,7 +2,7 @@ Contribute and Support
 ======================
 
 - Please submit any changes via `GitHub`_ pull requests.
-- If you use any existing code, please make sure it is compatible to *LGPL v3*
+- If you use any existing code, please make sure it is compatible to *Apache v2*
 - Ensure that your code complies to `PEP8`_.
 - Ensure that your code works with *Python 3.6* and *PyPy 7.1.1*.
 - Please contact the author first if your changes are not back compatible or import new dependencies.

docs/src/installation.rst

@@ -19,8 +19,7 @@ Setup python3.6 virtual environment with editable installation:
 
     python3.6 -m venv venv
     . venv/bin/activate
-    pip3 install -e .
-    pip3 install pytest pytest-cov flake8
+    pip3 install -e .[dev]
 
 Run all tests:
 

docs/src/schema/schema.rst

@@ -1,10 +1,14 @@
 :mod:`ndn.schema` package
 ============================
 
+.. warning::
+
+  Name Tree Schema is experimental and capricious.
+
 Introduction
 ------------
 
-The :mod:`ndn.security` package provides an implementation of CNL application framework.
+The :mod:`ndn.security` package provides an implementation of Name Tree Schema.
 
 
 CNL Static Namespace Tree

examples/catchunks.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

examples/consumer.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

examples/nfd_status.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

examples/producer.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

examples/putchunks.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

examples/rdrnode.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

examples/rpc_consumer.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

examples/rpc_producer.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

setup.py

@@ -48,6 +48,6 @@
     install_requires=requirements,
     python_requires=">=3.6",
     extras_require={
-        "dev":  ["pytest>=5.3.5", "pytest-cov>=2.8.1"],
+        "dev":  ["pytest>=5.3.5", "pytest-cov>=2.8.1", "flake8>=3.7.9"],
     }
 )

src/ndn/app.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

src/ndn/app_support/nfd_mgmt.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

src/ndn/app_support/security_v2.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

src/ndn/app_support/segment_fetcher.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

src/ndn/client_conf.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

src/ndn/encoding/name/Component.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

src/ndn/encoding/name/Name.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

src/ndn/encoding/ndn_format_0_3.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

src/ndn/encoding/ndnlp_v2.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #
@@ -16,10 +16,9 @@
 # limitations under the License.
 # -----------------------------------------------------------------------------
 from typing import Optional
-from .tlv_type import BinaryStr, VarBinaryStr, NonStrictName
+from .tlv_type import BinaryStr, VarBinaryStr
 from .tlv_var import parse_and_check_tl
-from .tlv_model import TlvModel, UintField, BytesField, ModelField, NameField, BoolField
-from .ndn_format_0_3 import InterestParam, TypeNumber, Links, Delegation
+from .tlv_model import TlvModel, UintField, BytesField, ModelField
 
 
 __all__ = ['LpTypeNumber', 'NackReason', 'parse_network_nack', 'make_network_nack']

src/ndn/encoding/signer.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

src/ndn/encoding/tlv_model.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

src/ndn/encoding/tlv_type.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

src/ndn/encoding/tlv_var.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

src/ndn/name_tree.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

src/ndn/schema/policy.py

@@ -1,3 +1,20 @@
+# -----------------------------------------------------------------------------
+# Copyright (C) 2019-2020 The python-ndn authors
+#
+# This file is part of python-ndn.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -----------------------------------------------------------------------------
 import abc
 from typing import Optional
 from ..encoding import SignaturePtrs, FormalName, InterestParam, BinaryStr

src/ndn/schema/schema_tree.py

@@ -1,3 +1,20 @@
+# -----------------------------------------------------------------------------
+# Copyright (C) 2019-2020 The python-ndn authors
+#
+# This file is part of python-ndn.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -----------------------------------------------------------------------------
 import asyncio as aio
 from typing import Dict, Any, Type, Optional
 from dataclasses import dataclass

src/ndn/schema/simple_cache.py

@@ -1,3 +1,20 @@
+# -----------------------------------------------------------------------------
+# Copyright (C) 2019-2020 The python-ndn authors
+#
+# This file is part of python-ndn.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -----------------------------------------------------------------------------
 import logging
 from ..encoding import FormalName, Name, BinaryStr, InterestParam
 from ..name_tree import NameTrie

src/ndn/schema/simple_node.py

@@ -1,3 +1,20 @@
+# -----------------------------------------------------------------------------
+# Copyright (C) 2019-2020 The python-ndn authors
+#
+# This file is part of python-ndn.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -----------------------------------------------------------------------------
 # TODO: Change these names
 from .schema_tree import Node
 from .util import norm_pattern
@@ -160,4 +177,3 @@ async def provide(self, match, content, **kwargs):
         self.timestamp = timestamp()
         submatch = match.finer_match(match.name + [Component.from_version(self.timestamp)])
         await submatch.provide(content, **kwargs)
-

src/ndn/schema/simple_trust.py

@@ -1,3 +1,20 @@
+# -----------------------------------------------------------------------------
+# Copyright (C) 2019-2020 The python-ndn authors
+#
+# This file is part of python-ndn.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -----------------------------------------------------------------------------
 import logging
 from typing import Callable, Dict, Any
 from Cryptodome.PublicKey import ECC, RSA

src/ndn/schema/util.py

@@ -1,5 +1,22 @@
+# -----------------------------------------------------------------------------
+# Copyright (C) 2019-2020 The python-ndn authors
+#
+# This file is part of python-ndn.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -----------------------------------------------------------------------------
 from typing import Union, List, Tuple
-from ..encoding import Name, Component, BinaryStr, get_tl_num_size, TypeNumber, write_tl_num
+from ..encoding import Name, Component, BinaryStr
 
 NamePattern = List[Union[BinaryStr, Tuple[int, int, str]]]
 r"""
@@ -45,4 +62,3 @@ def norm_pattern(name: str) -> NamePattern:
                 raise ValueError('Pattern variable name cannot be empty')
             ret[i] = (0, type_val, content)
     return ret
-

src/ndn/security/keychain/keychain.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

src/ndn/security/keychain/keychain_digest.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

src/ndn/security/keychain/keychain_sqlite3.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

src/ndn/security/osx.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

src/ndn/security/signer/sha256_digest_signer.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #

src/ndn/security/signer/sha256_ecdsa_signer.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2019-2020 Xinyu Ma
+# Copyright (C) 2019-2020 The python-ndn authors
 #
 # This file is part of python-ndn.
 #