From 8ed6a47bc1d6c9e04169490edb013f07a0936e1d Mon Sep 17 00:00:00 2001 From: qjing666 Date: Wed, 8 Jan 2020 10:54:25 +0800 Subject: [PATCH] fix the compatibility of python2 and pyhton3 --- docs/requirements.txt | 1 + paddle_fl/core/trainer/diffiehellman/diffiehellman.py | 6 +++--- paddle_fl/core/trainer/fl_trainer.py | 2 +- paddle_fl/version.py | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 1560ebc..90c6171 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -2,3 +2,4 @@ sphinx==2.1.0 mistune sphinx_rtd_theme paddlepaddle>=1.6 +zmq diff --git a/paddle_fl/core/trainer/diffiehellman/diffiehellman.py b/paddle_fl/core/trainer/diffiehellman/diffiehellman.py index 3d3e18a..364d01b 100644 --- a/paddle_fl/core/trainer/diffiehellman/diffiehellman.py +++ b/paddle_fl/core/trainer/diffiehellman/diffiehellman.py @@ -42,9 +42,9 @@ try: from ssl import RAND_bytes rng = RAND_bytes except(AttributeError, ImportError): - raise RNGError -#python2 -#rng = os.urandom + #python2 + rng = os.urandom + #raise RNGError class DiffieHellman: """ diff --git a/paddle_fl/core/trainer/fl_trainer.py b/paddle_fl/core/trainer/fl_trainer.py index dce6086..0252f1d 100755 --- a/paddle_fl/core/trainer/fl_trainer.py +++ b/paddle_fl/core/trainer/fl_trainer.py @@ -16,7 +16,7 @@ import logging from paddle_fl.core.scheduler.agent_master import FLWorkerAgent import numpy import hmac -#from .diffiehellman.diffiehellman import DiffieHellman +from .diffiehellman.diffiehellman import DiffieHellman class FLTrainerFactory(object): def __init__(self): diff --git a/paddle_fl/version.py b/paddle_fl/version.py index 5afa05e..be6e9b3 100644 --- a/paddle_fl/version.py +++ b/paddle_fl/version.py @@ -12,5 +12,5 @@ # See the License for the specific language governing permissions and # limitations under the License. """ PaddleFL version string """ -fl_version = "0.1.4" -module_proto_version = "0.1.4" +fl_version = "0.1.5" +module_proto_version = "0.1.5" -- GitLab