javaobj is now a package

__init__ ensures that imports from javaobj work as before

Author: tcalmant

javaobj/__init__.py

@@ -0,0 +1,42 @@
+#!/usr/bin/python
+# -- Content-Encoding: utf-8 --
+"""
+Provides functions for reading and writing (writing is WIP currently) Java
+objects serialized or will be deserialized by ObjectOutputStream. This form of
+object representation is a standard data interchange format in Java world.
+
+javaobj module exposes an API familiar to users of the standard library
+marshal, pickle and json modules.
+
+See:
+http://download.oracle.com/javase/6/docs/platform/serialization/spec/protocol.html
+
+:authors: Volodymyr Buell, Thomas Calmant
+:license: Apache License 2.0
+:version: 0.3.0
+:status: Alpha
+
+..
+
+    Copyright 2019 Thomas Calmant
+
+    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.
+"""
+
+# Imports giving access to what the javaobj module provides
+from javaobj.javaobj import *
+
+# ------------------------------------------------------------------------------
+
+# Documentation strings format
+__docformat__ = "restructuredtext en"

javaobj.py javaobj/javaobj.pyjavaobj.py renamed to javaobj/javaobj.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# -- Content-Encoding: UTF-8 --
+# -- Content-Encoding: utf-8 --
 """
 Provides functions for reading and writing (writing is WIP currently) Java
 objects serialized or will be deserialized by ObjectOutputStream. This form of
@@ -13,12 +13,12 @@
 
 :authors: Volodymyr Buell, Thomas Calmant
 :license: Apache License 2.0
-:version: 0.2.3
+:version: 0.3.0
 :status: Alpha
 
 ..
 
-    Copyright 2016 Thomas Calmant
+    Copyright 2019 Thomas Calmant
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@
 import struct
 import sys
 
-from modifiedutf8 import decode_modified_utf8
+from javaobj.modifiedutf8 import decode_modified_utf8
 
 try:
     # Python 2
@@ -51,8 +51,33 @@
 
 # ------------------------------------------------------------------------------
 
+__all__ = (
+    "__version_info__",
+    "__version__",
+    "DefaultObjectTransformer",
+    "JavaArray",
+    "JavaByteArray",
+    "JavaClass",
+    "JavaEnum",
+    "JavaObject",
+    "JavaObjectConstants",
+    "JavaObjectMarshaller",
+    "JavaObjectUnmarshaller",
+    "JavaString",
+    "OpCodeDebug",
+    "decode_modified_utf8",
+    "dumps",
+    "load",
+    "loads",
+    "log_debug",
+    "log_error",
+    "read_to_str",
+    "to_bytes",
+    "to_str",
+)
+
 # Module version
-__version_info__ = (0, 2, 3)
+__version_info__ = (0, 3, 0)
 __version__ = ".".join(str(x) for x in __version_info__)
 
 # Documentation strings format

modifiedutf8.py javaobj/modifiedutf8.pymodifiedutf8.py renamed to javaobj/modifiedutf8.py

@@ -7,12 +7,12 @@
 
 :authors: Volodymyr Buell, Thomas Calmant
 :license: Apache License 2.0
-:version: 0.2.4
+:version: 0.3.0
 :status: Alpha
 
 ..
 
-    Copyright 2016 Thomas Calmant
+    Copyright 2019 Thomas Calmant
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@
 # ------------------------------------------------------------------------------
 
 # Module version
-__version_info__ = (0, 2, 4)
+__version_info__ = (0, 3, 0)
 __version__ = ".".join(str(x) for x in __version_info__)
 
 # Documentation strings format
@@ -55,6 +55,7 @@ def read(fname):
 
 # ------------------------------------------------------------------------------
 
+
 setup(
     name="javaobj-py3",
     version=__version__,
@@ -66,7 +67,7 @@ def read(fname):
     description="Module for serializing and de-serializing Java objects.",
     license='Apache License 2.0',
     keywords="python java marshalling serialization",
-    py_modules=['javaobj'],
+    packages=['javaobj'],
     test_suite="tests.tests",
     long_description=read('README.rst'),
     classifiers=[
@@ -77,5 +78,6 @@ def read(fname):
             'Programming Language :: Python :: 3.4',
             'Programming Language :: Python :: 3.5',
             'Programming Language :: Python :: 3.6',
+            'Programming Language :: Python :: 3.7',
             "Topic :: Software Development :: Libraries :: Python Modules",
     ])