Bitmessage/PyBitmessage-2024-08-21
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Updated code quality imports placement changes, ignore comment for logging, Added bare except warning ignore comments & replaced unicode by decode function in depends.py

Browse Source 
Added bare except warning ignore comments

Reverted pyelliptic import placement change

Replaced unicode by decode function, reveted logging import placement changes & added ignore comment
This commit is contained in:
kuldeep.k@cisinlabs.com 2021-08-23 13:19:54 +05:30
parent 06392c9a3d
commit 64f89f319b
No known key found for this signature in database
GPG Key ID: AF4FB299BF7C7C2A
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/depends.py
View File

@ -3,7 +3,11 @@ Utility functions to check the availability of dependencies
and suggest how it may be installed and suggest how it may be installed
""" """
import os
import re
import subprocess
import sys import sys
from importlib import import_module
# Only really old versions of Python don't have sys.hexversion. We don't # Only really old versions of Python don't have sys.hexversion. We don't
# support them. The logging module was introduced in Python 2.3 # support them. The logging module was introduced in Python 2.3
@ -14,9 +18,7 @@ if not hasattr(sys, 'hexversion') or sys.hexversion < 0x20300F0:
% sys.version % sys.version
) )
import logging import logging # noqa:E402
import os
from importlib import import_module
# We can now use logging so set up a simple configuration # We can now use logging so set up a simple configuration
formatter = logging.Formatter('%(levelname)s: %(message)s') formatter = logging.Formatter('%(levelname)s: %(message)s')
@ -248,7 +250,6 @@ def check_openssl():
if sys.platform == 'win32': if sys.platform == 'win32':
paths = ['libeay32.dll'] paths = ['libeay32.dll']
if getattr(sys, 'frozen', False): if getattr(sys, 'frozen', False):
import os.path
paths.insert(0, os.path.join(sys._MEIPASS, 'libeay32.dll')) paths.insert(0, os.path.join(sys._MEIPASS, 'libeay32.dll'))
else: else:
paths = ['libcrypto.so', 'libcrypto.so.1.0.0'] paths = ['libcrypto.so', 'libcrypto.so.1.0.0']
@ -258,7 +259,7 @@ def check_openssl():
'/usr/local/opt/openssl/lib/libcrypto.dylib', '/usr/local/opt/openssl/lib/libcrypto.dylib',
'./../Frameworks/libcrypto.dylib' './../Frameworks/libcrypto.dylib'
]) ])
import re
if re.match(r'linux|darwin|freebsd', sys.platform): if re.match(r'linux|darwin|freebsd', sys.platform):
try: try:
import ctypes.util import ctypes.util
@ -338,8 +339,6 @@ def check_curses():
logger.error('The curses interface can not be used.') logger.error('The curses interface can not be used.')
return False return False
import subprocess
try: try:
subprocess.check_call(['which', 'dialog']) subprocess.check_call(['which', 'dialog'])
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
@ -353,7 +352,7 @@ def check_curses():
# The pythondialog author does not like Python2 str, so we have to use # The pythondialog author does not like Python2 str, so we have to use
# unicode for just the version otherwise we get the repr form which # unicode for just the version otherwise we get the repr form which
# includes the module and class names along with the actual version. # includes the module and class names along with the actual version.
logger.info('dialog Utility Version %s', unicode(dialog_util_version)) logger.info('dialog Utility Version %s', dialog_util_version.decode('utf-8'))
return True return True