Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
镜像
Python_Packaging_Authority
pip
提交
e15ef595
P
pip
项目概览
镜像
/
Python_Packaging_Authority
/
pip
12 个月 前同步成功
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
pip
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
e15ef595
编写于
3月 11, 2020
作者:
P
Pradyun Gedam
提交者:
GitHub
3月 11, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #7840 from xavfernandez/revert_progress_bar_format_change
cli: revert format() related changes
上级
4d1932fc
a096d4cd
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
15 addition
and
18 deletion
+15
-18
src/pip/_internal/cli/progress_bars.py
src/pip/_internal/cli/progress_bars.py
+15
-18
未找到文件。
src/pip/_internal/cli/progress_bars.py
浏览文件 @
e15ef595
...
...
@@ -14,7 +14,7 @@ from pip._internal.utils.misc import format_size
from
pip._internal.utils.typing
import
MYPY_CHECK_RUNNING
if
MYPY_CHECK_RUNNING
:
from
typing
import
Any
,
Dict
,
Iterator
,
List
,
Tuple
from
typing
import
Any
,
Dict
,
List
try
:
from
pip._vendor
import
colorama
...
...
@@ -124,7 +124,7 @@ class SilentBar(Bar):
class
BlueEmojiBar
(
IncrementalBar
):
suffix
=
"
{percent:.0f}
%"
suffix
=
"
%(percent)d%
%"
bar_prefix
=
" "
bar_suffix
=
" "
phases
=
(
u
"
\U0001F539
"
,
u
"
\U0001F537
"
,
u
"
\U0001F535
"
)
# type: Any
...
...
@@ -203,8 +203,8 @@ class BaseDownloadProgressBar(WindowsMixin, InterruptibleMixin,
DownloadProgressMixin
):
file
=
sys
.
stdout
message
=
"
{percent:.0f}
%"
suffix
=
"
{downloaded} {download_speed} {pretty_eta}
"
message
=
"
%(percent)d%
%"
suffix
=
"
%(downloaded)s %(download_speed)s %(pretty_eta)s
"
# NOTE: The "type: ignore" comments on the following classes are there to
# work around https://github.com/python/typing/issues/241
...
...
@@ -238,7 +238,7 @@ class DownloadProgressSpinner(WindowsMixin, InterruptibleMixin,
DownloadProgressMixin
,
Spinner
):
file
=
sys
.
stdout
suffix
=
"
{downloaded} {download_speed}
"
suffix
=
"
%(downloaded)s %(download_speed)s
"
def
next_phase
(
self
):
# type: ignore
if
not
hasattr
(
self
,
"_phaser"
):
...
...
@@ -247,21 +247,18 @@ class DownloadProgressSpinner(WindowsMixin, InterruptibleMixin,
def
update
(
self
):
# type: () -> None
vals
=
dict
(
self
.
_load_vals
(
'downloaded'
,
'download_speed'
,
'pretty_eta'
,
'percent'
))
message
=
self
.
message
.
format
(
**
vals
)
message
=
self
.
message
%
self
phase
=
self
.
next_phase
()
suffix
=
self
.
suffix
.
format
(
**
vals
)
line
=
" "
.
join
(
filter
(
None
,
(
message
,
phase
,
suffix
)))
self
.
writeln
(
line
)
suffix
=
self
.
suffix
%
self
line
=
''
.
join
([
message
,
" "
if
message
else
""
,
phase
,
" "
if
suffix
else
""
,
suffix
,
])
def
_load_vals
(
self
,
*
names
):
# type: (*str) -> Iterator[Tuple[str, Any]]
for
name
in
names
:
try
:
yield
name
,
getattr
(
self
,
name
)
except
Exception
:
pass
self
.
writeln
(
line
)
BAR_TYPES
=
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录