afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

updated Queue and ConfigParser to use 2/3 compatible imports

Browse source
This commit is contained in:
bharnden 2019-05-05 21:49:42 -07:00
parent b58d32c156
commit 864c7b69a1
6 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/core/api/grpc/server.py
View file

@ -3,8 +3,8 @@ import logging
import os import os
import tempfile import tempfile
import time import time
from Queue import Queue, Empty
from builtins import int from builtins import int
from queue import Queue, Empty
import grpc import grpc
from concurrent import futures from concurrent import futures

6
daemon/core/api/tlv/corehandlers.py
View file

@ -2,9 +2,9 @@
socket server request handlers leveraged by core servers. socket server request handlers leveraged by core servers.
""" """
import Queue
import logging import logging
import os import os
import queue
import shlex import shlex
import shutil import shutil
import socketserver import socketserver
@ -69,7 +69,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
MessageTypes.EVENT.value: self.handle_event_message, MessageTypes.EVENT.value: self.handle_event_message,
MessageTypes.SESSION.value: self.handle_session_message, MessageTypes.SESSION.value: self.handle_session_message,
} }
self.message_queue = Queue.Queue() self.message_queue = queue.Queue()
self.node_status_request = {} self.node_status_request = {}
self._shutdown_lock = threading.Lock() self._shutdown_lock = threading.Lock()
self._sessions_lock = threading.Lock() self._sessions_lock = threading.Lock()
@ -466,7 +466,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
try: try:
message = self.message_queue.get(timeout=1) message = self.message_queue.get(timeout=1)
self.handle_message(message) self.handle_message(message)
except Queue.Empty: except queue.Empty:
pass pass
def handle_message(self, message): def handle_message(self, message):

1
daemon/requirements.txt
View file

@ -1,4 +1,5 @@
enum34==1.1.6 enum34==1.1.6
configparser=3.5.0
future==0.17.1 future==0.17.1
futures==3.2.0 futures==3.2.0
grpcio==1.18.0 grpcio==1.18.0

4
daemon/scripts/core-daemon
View file

@ -6,7 +6,7 @@ message handlers are defined and some support for sending messages.
""" """
import argparse import argparse
import ConfigParser import configparser
import logging import logging
import sys import sys
import threading import threading
@ -100,7 +100,7 @@ def get_merged_config(filename):
if args.configfile is not None: if args.configfile is not None:
filename = args.configfile filename = args.configfile
del args.configfile del args.configfile
cfg = ConfigParser.SafeConfigParser(defaults) cfg = configparser.ConfigParser(defaults)
cfg.read(filename) cfg.read(filename)
section = "core-daemon" section = "core-daemon"

1
daemon/setup.py.in
View file

@ -43,6 +43,7 @@ setup(
packages=find_packages(), packages=find_packages(),
install_requires=[ install_requires=[
"enum34", "enum34",
"configparser",
"future", "future",
"lxml" "lxml"
], ],

2
daemon/tests/test_grpc.py
View file

@ -1,6 +1,6 @@
import time import time
from Queue import Queue
from builtins import int from builtins import int
from queue import Queue
import grpc import grpc
import pytest import pytest