Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蜕变的菜鸟
glances
提交
85fa23ab
G
glances
项目概览
蜕变的菜鸟
/
glances
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
glances
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
85fa23ab
编写于
10月 31, 2016
作者:
A
Alessio Sergi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "Deprecated platform method in Python 3.7 #945"
This reverts commit
4877be45
.
上级
fc9580bc
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
6 addition
and
23 deletion
+6
-23
NEWS
NEWS
+0
-1
glances/plugins/glances_system.py
glances/plugins/glances_system.py
+5
-20
requirements.txt
requirements.txt
+0
-1
setup.py
setup.py
+1
-1
未找到文件。
NEWS
浏览文件 @
85fa23ab
...
...
@@ -21,7 +21,6 @@ Enhancements and news features:
* Configure server cached time from the command line --cached-time (issue #901)
* Make the log logger configurable (issue #900)
* System uptime in export (issue #890)
* Deprecated platform method in Python 3.7 (issue #945)
* Refactor the --disable-* options (issue #948)
Bugs corrected:
...
...
glances/plugins/glances_system.py
浏览文件 @
85fa23ab
...
...
@@ -23,14 +23,7 @@ import os
import
platform
import
re
from
io
import
open
try
:
import
distro
except
ImportError
:
distro_tag
=
False
else
:
distro_tag
=
True
from
glances.logger
import
logger
from
glances.compat
import
iteritems
from
glances.plugins.glances_plugin
import
GlancesPlugin
...
...
@@ -120,19 +113,11 @@ class Plugin(GlancesPlugin):
self
.
stats
[
'hostname'
]
=
platform
.
node
()
self
.
stats
[
'platform'
]
=
platform
.
architecture
()[
0
]
if
self
.
stats
[
'os_name'
]
==
"Linux"
:
if
distro_tag
:
# Use the distro external lib
# Why ?
# Because platform.linux_distribution is predicated in Python 3.7
linux_distro
=
distro
.
linux_distribution
()
self
.
stats
[
'linux_distro'
]
=
' '
.
join
(
linux_distro
[:
2
])
linux_distro
=
platform
.
linux_distribution
()
if
linux_distro
[
0
]
==
''
:
self
.
stats
[
'linux_distro'
]
=
_linux_os_release
()
else
:
try
:
# For Python < 3.7
linux_distro
=
platform
.
linux_distribution
()
self
.
stats
[
'linux_distro'
]
=
' '
.
join
(
linux_distro
[:
2
])
except
AttributeError
:
self
.
stats
[
'linux_distro'
]
=
_linux_os_release
()
self
.
stats
[
'linux_distro'
]
=
' '
.
join
(
linux_distro
[:
2
])
self
.
stats
[
'os_version'
]
=
platform
.
release
()
elif
self
.
stats
[
'os_name'
].
endswith
(
'BSD'
):
self
.
stats
[
'os_version'
]
=
platform
.
release
()
...
...
requirements.txt
浏览文件 @
85fa23ab
psutil
==4.4.0
distro
==1.0.0
setup.py
浏览文件 @
85fa23ab
...
...
@@ -33,7 +33,7 @@ def get_data_files():
def
get_requires
():
requires
=
[
'psutil>=2.0.0'
,
'distro>=1.0.0'
]
requires
=
[
'psutil>=2.0.0'
]
return
requires
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录