Commit 8eeb3d50 authored by ibuler's avatar ibuler

[Update] 升级依赖包版本,搜索忽略大小写

parent 62d5de14
...@@ -213,7 +213,7 @@ class Config(dict): ...@@ -213,7 +213,7 @@ class Config(dict):
filename = os.path.join(self.root_path, filename) filename = os.path.join(self.root_path, filename)
try: try:
with open(filename) as f: with open(filename) as f:
obj = yaml.load(f) obj = yaml.safe_load(f)
except IOError as e: except IOError as e:
if silent and e.errno in (errno.ENOENT, errno.EISDIR): if silent and e.errno in (errno.ENOENT, errno.EISDIR):
return False return False
......
...@@ -161,7 +161,7 @@ def is_obj_attr_has(obj, val, attrs=("hostname", "ip", "comment")): ...@@ -161,7 +161,7 @@ def is_obj_attr_has(obj, val, attrs=("hostname", "ip", "comment")):
hasattr(obj, attr) and isinstance(hasattr(obj, attr), (str, int))] hasattr(obj, attr) and isinstance(hasattr(obj, attr), (str, int))]
for v in vals: for v in vals:
if str(v).find(val) != -1: if str(v).lower().find(val.lower()) != -1:
return True return True
return False return False
...@@ -173,7 +173,7 @@ def is_obj_attr_eq(obj, val, attrs=("id", "hostname", "ip")): ...@@ -173,7 +173,7 @@ def is_obj_attr_eq(obj, val, attrs=("id", "hostname", "ip")):
vals = [getattr(obj, attr) for attr in attrs if hasattr(obj, attr)] vals = [getattr(obj, attr) for attr in attrs if hasattr(obj, attr)]
for v in vals: for v in vals:
if str(v) == str(val): if str(v).lower() == str(val).lower():
return True return True
return False return False
......
...@@ -16,13 +16,13 @@ Flask==1.0.2 ...@@ -16,13 +16,13 @@ Flask==1.0.2
Flask-SocketIO==2.9.2 Flask-SocketIO==2.9.2
idna==2.6 idna==2.6
itsdangerous==0.24 itsdangerous==0.24
Jinja2==2.10 Jinja2==2.10.1
jmespath==0.9.3 jmespath==0.9.3
jms-storage==0.0.22 jms-storage==0.0.22
jumpserver-python-sdk==0.0.58 jumpserver-python-sdk==0.0.58
MarkupSafe==1.0 MarkupSafe==1.0
oss2==2.4.0 oss2==2.4.0
paramiko==2.4.1 paramiko==2.4.2
psutil==5.4.1 psutil==5.4.1
pyasn1==0.4.2 pyasn1==0.4.2
pycparser==2.19 pycparser==2.19
...@@ -33,14 +33,14 @@ python-engineio==2.1.0 ...@@ -33,14 +33,14 @@ python-engineio==2.1.0
python-gssapi==0.6.4 python-gssapi==0.6.4
python-socketio==1.8.3 python-socketio==1.8.3
pytz==2018.3 pytz==2018.3
requests==2.18.4 requests==2.22.0
s3transfer==0.1.13 s3transfer==0.1.13
simplejson==3.13.2 simplejson==3.13.2
six==1.11.0 six==1.11.0
tornado==4.5.2 tornado==4.5.2
urllib3==1.22 urllib3==1.25.2
wcwidth==0.1.7 wcwidth==0.1.7
eventlet==0.24.1 eventlet==0.24.1
Werkzeug==0.14.1 Werkzeug==0.14.1
treelib==1.5.3 treelib==1.5.3
pyyaml==3.13 PyYAML==5.1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment