nanopb 1.0.0.dev1496__tar.gz → 1.0.0.dev1499__tar.gz

{nanopb-1.0.0.dev1496 → nanopb-1.0.0.dev1499}/PKG-INFO

@@ -1,21 +1,15 @@
 Metadata-Version: 2.1
 Name: nanopb
-Version: 1.0.0.dev1496
+Version: 1.0.0.dev1499
 Summary: Nanopb is a small code-size Protocol Buffers implementation in ansi C. It is especially suitable for use in microcontrollers, but fits any memory restricted system.
 Home-page: https://jpa.kapsi.fi/nanopb/
 License: Zlib
 Keywords: protobuf,protoc
 Author: Petteri Aimonen
 Author-email: jpa@npb.mail.kapsi.fi
-Requires-Python: >=2.7
+Requires-Python: >=3.8
 Classifier: License :: OSI Approved
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.4
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10

{nanopb-1.0.0.dev1496 → nanopb-1.0.0.dev1499}/nanopb/generator/nanopb_generator.py

@@ -34,8 +34,8 @@ try:
     import google.protobuf.text_format as text_format
     import google.protobuf.descriptor_pb2 as descriptor
     import google.protobuf.compiler.plugin_pb2 as plugin_pb2
-    import google.protobuf.reflection as reflection
     import google.protobuf.descriptor
+    import google.protobuf.message_factory as message_factory
 except:
     sys.stderr.write('''
          **********************************************************************
@@ -47,6 +47,15 @@ except:
     ''' + '\n')
     raise
 
+# GetMessageClass() is used by modern python-protobuf (around 5.x onwards)
+# Retain compatibility with older python-protobuf versions.
+try:
+    import google.protobuf.message_factory as message_factory
+    GetMessageClass = message_factory.GetMessageClass
+except AttributeError:
+    import google.protobuf.reflection as reflection
+    GetMessageClass = reflection.MakeClass
+
 # Depending on how this script is run, we may or may not have PEP366 package name
 # available for relative imports.
 if not __package__:
@@ -194,27 +203,12 @@ class Globals:
     protoc_insertion_points = False
     naming_style = NamingStyle()
 
-# String types and file encoding for Python2 UTF-8 support
-if sys.version_info.major == 2:
-    import codecs
-    open = codecs.open
-    strtypes = (unicode, str)
-
-    def str(x):
-        try:
-            return strtypes[1](x)
-        except UnicodeEncodeError:
-            return strtypes[0](x)
-else:
-    strtypes = (str, )
-
-
 class Names:
     '''Keeps a set of nested names and formats them to C identifier.'''
     def __init__(self, parts = ()):
         if isinstance(parts, Names):
             parts = parts.parts
-        elif isinstance(parts, strtypes):
+        elif isinstance(parts, str):
             parts = (parts,)
         self.parts = tuple(parts)
 
@@ -228,7 +222,7 @@ class Names:
         return 'Names(%s)' % ','.join("'%s'" % x for x in self.parts)
 
     def __add__(self, other):
-        if isinstance(other, strtypes):
+        if isinstance(other, str):
             return Names(self.parts + (other,))
         elif isinstance(other, Names):
             return Names(self.parts + other.parts)
@@ -274,7 +268,7 @@ class EncodedSize:
             self.symbols = value.symbols
             self.declarations = value.declarations
             self.required_defines = value.required_defines
-        elif isinstance(value, strtypes + (Names,)):
+        elif isinstance(value, (str, Names)):
             self.symbols = [str(value)]
             self.value = 0
             self.declarations = []
@@ -288,7 +282,7 @@ class EncodedSize:
     def __add__(self, other):
         if isinstance(other, int):
             return EncodedSize(self.value + other, self.symbols, self.declarations, self.required_defines)
-        elif isinstance(other, strtypes + (Names,)):
+        elif isinstance(other, (str, Names)):
             return EncodedSize(self.value, self.symbols + [str(other)], self.declarations, self.required_defines + [str(other)])
         elif isinstance(other, EncodedSize):
             return EncodedSize(self.value + other.value, self.symbols + other.symbols,
@@ -1689,7 +1683,7 @@ class Message(ProtoElement):
         optional_only.name += str(id(self))
 
         desc = google.protobuf.descriptor.MakeDescriptor(optional_only)
-        msg = reflection.MakeClass(desc)()
+        msg = GetMessageClass(desc)()
 
         for field in optional_only.field:
             if field.type == FieldD.TYPE_STRING:

{nanopb-1.0.0.dev1496 → nanopb-1.0.0.dev1499}/nanopb/generator/proto/__init__.py

@@ -7,25 +7,9 @@ import sys
 import tempfile
 import shutil
 import traceback
+from tempfile import TemporaryDirectory
 from ._utils import has_grpcio_protoc, invoke_protoc, print_versions
 
-# Compatibility layer to make TemporaryDirectory() available on Python 2.
-try:
-    from tempfile import TemporaryDirectory
-except ImportError:
-    class TemporaryDirectory:
-        '''TemporaryDirectory fallback for Python 2'''
-        def __init__(self, prefix = 'tmp', dir = None):
-            self.prefix = prefix
-            self.dir = dir
-
-        def __enter__(self):
-            self.dir = tempfile.mkdtemp(prefix = self.prefix, dir = self.dir)
-            return self.dir
-
-        def __exit__(self, *args):
-            shutil.rmtree(self.dir)
-
 def build_nanopb_proto(protosrc, dirname):
     '''Try to build a .proto file for python-protobuf.
     Returns True if successful.

{nanopb-1.0.0.dev1496 → nanopb-1.0.0.dev1499}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nanopb"
-version = "1.0.0-dev1496"
+version = "1.0.0-dev1499"
 description = "Nanopb is a small code-size Protocol Buffers implementation in ansi C. It is especially suitable for use in microcontrollers, but fits any memory restricted system."
 authors = ["Petteri Aimonen <jpa@npb.mail.kapsi.fi>"]
 license = "Zlib"
@@ -17,7 +17,7 @@ nanopb_generator = "nanopb.generator.nanopb_generator:main_cli"
 protoc-gen-nanopb = "nanopb.generator.nanopb_generator:main_plugin"
 
 [tool.poetry.dependencies]
-python = ">=2.7"
+python = ">=3.8"
 protobuf = ">=3.19"
 grpcio-tools = {version=">=1.46.0", optional=true}
 

nanopb-1.0.0.dev1496/nanopb/generator/nanopb_generator.py2

@@ -1,13 +0,0 @@
-#!/usr/bin/env python2
-# This file is a wrapper around nanopb_generator.py in case you want to run
-# it with Python 2 instead of default Python 3. This only exists for backwards
-# compatibility, do not use for new projects.
-
-from nanopb_generator import *
-
-if __name__ == '__main__':
-    # Check if we are running as a plugin under protoc
-    if 'protoc-gen-' in sys.argv[0] or '--protoc-plugin' in sys.argv:
-        main_plugin()
-    else:
-        main_cli()

nanopb-1.0.0.dev1496/nanopb/generator/protoc-gen-nanopb-py2

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# This file is used to invoke nanopb_generator.py2 as a plugin
-# to protoc on Linux and other *nix-style systems.
-#
-# The difference from protoc-gen-nanopb is that this executes with Python 2.
-#
-# Use it like this:
-# protoc --plugin=protoc-gen-nanopb=..../protoc-gen-nanopb-py2 --nanopb_out=dir foo.proto
-#
-# Note that if you use the binary package of nanopb, the protoc
-# path is already set up properly and there is no need to give
-# --plugin= on the command line.
-
-MYPATH=$(dirname "$0")
-exec "$MYPATH/nanopb_generator.py2" --protoc-plugin