ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-04 08:40:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove humanize, use internal method, teach internal method to understand timedelta

Browse Source
This commit is contained in:
meejah 2016-02-03 12:38:16 -07:00 committed by Brian Warner
parent 573a5481d1
commit 9cfcb1b3aa
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/allmydata/_auto_deps.py
View File

@ -54,8 +54,6 @@ install_requires = [
"pyasn1 >= 0.1.8", # latest pyasn1-modules depends on this version "pyasn1 >= 0.1.8", # latest pyasn1-modules depends on this version
"pyasn1-modules >= 0.0.5", # service-identity depends on this "pyasn1-modules >= 0.0.5", # service-identity depends on this
"humanize >= 0.5.1", # might not *need* to be this new
# * On Linux we need at least Twisted 10.1.0 for inotify support # * On Linux we need at least Twisted 10.1.0 for inotify support
# used by the drop-upload frontend. # used by the drop-upload frontend.
# * We also need Twisted 10.1.0 for the FTP frontend in order for # * We also need Twisted 10.1.0 for the FTP frontend in order for
@ -118,13 +116,11 @@ package_imports = [
('enum34', 'enum'), ('enum34', 'enum'),
('pycparser', 'pycparser'), ('pycparser', 'pycparser'),
('PyYAML', 'yaml'), ('PyYAML', 'yaml'),
('humanize', 'humanize'),
] ]
# Dependencies for which we don't know how to get a version number at run-time. # Dependencies for which we don't know how to get a version number at run-time.
not_import_versionable = [ not_import_versionable = [
'zope.interface', 'zope.interface',
'humanize',
] ]
# Dependencies reported by pkg_resources that we can safely ignore. # Dependencies reported by pkg_resources that we can safely ignore.

16
src/allmydata/scripts/magic_folder_cli.py
View File

@ -6,7 +6,6 @@ from types import NoneType
from cStringIO import StringIO from cStringIO import StringIO
from datetime import datetime from datetime import datetime
import humanize
import simplejson import simplejson
from twisted.python import usage from twisted.python import usage
@ -23,6 +22,7 @@ from allmydata.scripts.common_http import do_http, format_http_success, \
from allmydata.util import fileutil from allmydata.util import fileutil
from allmydata.util import configutil from allmydata.util import configutil
from allmydata import uri from allmydata import uri
from allmydata.util.abbreviate import abbreviate_space, abbreviate_time
INVITE_SEPARATOR = "+" INVITE_SEPARATOR = "+"
@ -250,7 +250,7 @@ def _print_item_status(item, now, longest):
paddedname = (' ' * (longest - len(item['path']))) + item['path'] paddedname = (' ' * (longest - len(item['path']))) + item['path']
if 'failure_at' in item: if 'failure_at' in item:
ts = datetime.fromtimestamp(item['started_at']) ts = datetime.fromtimestamp(item['started_at'])
prog = 'Failed %s (%s)' % (humanize.naturaltime(now - ts), ts) prog = 'Failed %s (%s)' % (abbreviate_time(now - ts), ts)
elif item['percent_done'] < 100.0: elif item['percent_done'] < 100.0:
if 'started_at' not in item: if 'started_at' not in item:
prog = 'not yet started' prog = 'not yet started'
@ -262,7 +262,7 @@ def _print_item_status(item, now, longest):
time_left = (100.0 - item['percent_done']) / rate time_left = (100.0 - item['percent_done']) / rate
prog = '%2.1f%% done, around %s left' % ( prog = '%2.1f%% done, around %s left' % (
item['percent_done'], item['percent_done'],
humanize.naturaldelta(time_left), abbreviate_time(time_left),
) )
else: else:
time_left = None time_left = None
@ -275,7 +275,7 @@ def _print_item_status(item, now, longest):
keyname = verb + '_at' keyname = verb + '_at'
if keyname in item: if keyname in item:
when = datetime.fromtimestamp(item[keyname]) when = datetime.fromtimestamp(item[keyname])
prog = '%s %s' % (verb, humanize.naturaltime(now - when)) prog = '%s %s' % (verb, abbreviate_time(now - when))
break break
print " %s: %s" % (paddedname, prog) print " %s: %s" % (paddedname, prog)
@ -305,8 +305,8 @@ def status(options):
size = meta['size'] size = meta['size']
created = datetime.fromtimestamp(meta['metadata']['tahoe']['linkcrtime']) created = datetime.fromtimestamp(meta['metadata']['tahoe']['linkcrtime'])
version = meta['metadata']['version'] version = meta['metadata']['version']
nice_size = humanize.naturalsize(size) nice_size = abbreviate_space(size)
nice_created = humanize.naturaltime(now - created) nice_created = abbreviate_time(now - created)
if captype != 'filenode': if captype != 'filenode':
print "%20s: error, should be a filecap" % name print "%20s: error, should be a filecap" % name
continue continue
@ -332,8 +332,8 @@ def status(options):
size = meta['size'] size = meta['size']
created = datetime.fromtimestamp(meta['metadata']['tahoe']['linkcrtime']) created = datetime.fromtimestamp(meta['metadata']['tahoe']['linkcrtime'])
version = meta['metadata']['version'] version = meta['metadata']['version']
nice_size = humanize.naturalsize(size) nice_size = abbreviate_space(size)
nice_created = humanize.naturaltime(now - created) nice_created = abbreviate_time(now - created)
print " %s (%s): %s, version=%s, created %s" % (n, nice_size, status, version, nice_created) print " %s (%s): %s, version=%s, created %s" % (n, nice_size, status, version, nice_created)
with open(os.path.join(nodedir, u'private', u'api_auth_token'), 'rb') as f: with open(os.path.join(nodedir, u'private', u'api_auth_token'), 'rb') as f:

2
src/allmydata/test/check_magicfolder_smoke.py
View File

@ -360,7 +360,7 @@ if True:
if True: if True:
# bob leaves # bob leaves
print 'bob leaves' print('bob leaves')
data_dir = join(data_base, 'bob') data_dir = join(data_base, 'bob')
subprocess.check_call( subprocess.check_call(
[ [