mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-06 02:49:35 +02:00
Fix platform name in Python 2 with --verbose (Closes #1228)
This commit is contained in:
parent
ce6a696e4d
commit
c496ca96e7
@ -45,6 +45,7 @@
|
|||||||
import warnings
|
import warnings
|
||||||
import platform
|
import platform
|
||||||
|
|
||||||
|
|
||||||
from .utils import *
|
from .utils import *
|
||||||
from .update import update_self
|
from .update import update_self
|
||||||
from .version import __version__
|
from .version import __version__
|
||||||
@ -611,7 +612,7 @@ def _real_main(argv=None):
|
|||||||
sys.exc_clear()
|
sys.exc_clear()
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
sys.stderr.write(u'[debug] Python version %s - %s' %(platform.python_version(), platform.platform()) + u'\n')
|
sys.stderr.write(u'[debug] Python version %s - %s' %(platform.python_version(), platform_name()) + u'\n')
|
||||||
sys.stderr.write(u'[debug] Proxy map: ' + str(proxy_handler.proxies) + u'\n')
|
sys.stderr.write(u'[debug] Proxy map: ' + str(proxy_handler.proxies) + u'\n')
|
||||||
|
|
||||||
ydl.add_default_info_extractors()
|
ydl.add_default_info_extractors()
|
||||||
|
@ -1,19 +1,20 @@
|
|||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
import datetime
|
||||||
|
import email.utils
|
||||||
import errno
|
import errno
|
||||||
import gzip
|
import gzip
|
||||||
import io
|
import io
|
||||||
import json
|
import json
|
||||||
import locale
|
import locale
|
||||||
import os
|
import os
|
||||||
|
import platform
|
||||||
import re
|
import re
|
||||||
|
import socket
|
||||||
import sys
|
import sys
|
||||||
import traceback
|
import traceback
|
||||||
import zlib
|
import zlib
|
||||||
import email.utils
|
|
||||||
import socket
|
|
||||||
import datetime
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import urllib.request as compat_urllib_request
|
import urllib.request as compat_urllib_request
|
||||||
@ -732,3 +733,13 @@ def __contains__(self, date):
|
|||||||
return self.start <= date <= self.end
|
return self.start <= date <= self.end
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return '%s - %s' % ( self.start.isoformat(), self.end.isoformat())
|
return '%s - %s' % ( self.start.isoformat(), self.end.isoformat())
|
||||||
|
|
||||||
|
|
||||||
|
def platform_name():
|
||||||
|
""" Returns the platform name as a compat_str """
|
||||||
|
res = platform.platform()
|
||||||
|
if isinstance(res, bytes):
|
||||||
|
res = res.decode(preferredencoding())
|
||||||
|
|
||||||
|
assert isinstance(res, compat_str)
|
||||||
|
return res
|
||||||
|
Loading…
Reference in New Issue
Block a user