diff --git a/Docker/Dockerfile b/Docker/Dockerfile index ef55938..0b90f1a 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -1,4 +1,4 @@ -FROM python:2.7.15-alpine3.8 +FROM python:3.7.0-alpine3.8 LABEL maintainer="Evan Richardson" LABEL version="1.0" @@ -6,9 +6,9 @@ LABEL version="1.0" WORKDIR /app COPY . /app ENV PYTHONPATH=/app/src/python -RUN pip install --upgrade pip -RUN pip install -r requirements.txt -RUN rm -rf /var/cache/apk +RUN pip3 install --upgrade pip +RUN pip3 install -r requirements.txt +#RUN rm -rf /var/cache/apk CMD ["/app/src/bin/tHome-eagle.py", "-c", "/app/src/conf"] diff --git a/Docker/src/python/tHome/util/Data.py b/Docker/src/python/tHome/util/Data.py index f1f197c..10f4d76 100644 --- a/Docker/src/python/tHome/util/Data.py +++ b/Docker/src/python/tHome/util/Data.py @@ -1,5 +1,5 @@ #============================================================================= -import StringIO +import io #============================================================================= class Data: diff --git a/Docker/src/python/tHome/util/Error.py b/Docker/src/python/tHome/util/Error.py index 3ea6280..5172612 100644 --- a/Docker/src/python/tHome/util/Error.py +++ b/Docker/src/python/tHome/util/Error.py @@ -24,7 +24,7 @@ class Error ( Exception ): exception.add( msg ) - raise exception, None, trace + raise exception.with_traceback(trace) #----------------------------------------------------------------------- @staticmethod @@ -34,7 +34,7 @@ class Error ( Exception ): newError = Error( str( exception ) ) newError.add( msg ) - raise newError, None, trace + raise newError.with_traceback(trace) #----------------------------------------------------------------------- def __init__( self, msg ): diff --git a/Docker/src/python/tHome/util/fimport.py b/Docker/src/python/tHome/util/fimport.py index 67b7650..1309bc2 100644 --- a/Docker/src/python/tHome/util/fimport.py +++ b/Docker/src/python/tHome/util/fimport.py @@ -21,7 +21,7 @@ def fimport( filePath ): # Create a new module and exec the code in it's context. m = imp.new_module( rootName ) m.__file__ = absPath - exec code in m.__dict__ + exec(code, m.__dict__) # Return the module object. return m diff --git a/Docker/src/python/tHome/util/hex/dump.py b/Docker/src/python/tHome/util/hex/dump.py index c72f406..61b90b4 100644 --- a/Docker/src/python/tHome/util/hex/dump.py +++ b/Docker/src/python/tHome/util/hex/dump.py @@ -3,7 +3,7 @@ # Dump hex bytes to a table. # #=========================================================================== -import StringIO +import io #=========================================================================== def dump( buf ):