Skip to content

Consistent style, use ternary operator and enumerate #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hughdbrown wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Consistent style, use ternary operator and enumerate #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 9 additions & 24 deletions memory_utils/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import os
import sys

import psutil
from six import print_
from six.moves import range
Expand All @@ -36,7 +37,6 @@


class MemoryTooBigException(Exception):

""" The system crosses a set memory limit
"""
pass
Expand All @@ -51,7 +51,6 @@ def memory():
We care primarily about rss -- for once you bypass that -- bad things start to happen

returns int (rss in btyes)

"""
p = psutil.Process(os.getpid())
memory_info = p.get_memory_info()
Expand All @@ -69,18 +68,13 @@ def sizeof_fmt(num):
"""
if num == 0:
return '0'
if num < 0:
negative = True
else:
negative = False
fmt = "-%3.1f %s" if num < 0 else "%3.1f %s"
num = abs(num)

for x in ['bytes', 'KB', 'MB', 'GB', 'TB']:
if abs(num) < 1024.0:
if negative:
return "-%3.1f %s" % (num, x)
else:
return "%3.1f %s" % (num, x)
num = abs(num) / 1024.0
if num < 1024.0:
return fmt % (num, x)
num /= 1024.0


def print_memory(message=''):
Expand Down Expand Up @@ -123,7 +117,7 @@ def set_memory_limit(new_memory_limit):
_MEMORY_LIMIT = new_memory_limit


def set_verbose(bool):
def set_verbose(bool_val):
""" By default :func:`print_memory` will only print statements that move the memory
and :func:`memory_watcher` will not print its memory useage
If you want additional verbosity set this to true::
Expand All @@ -132,7 +126,7 @@ def set_verbose(bool):
memory_utils.set_verbose(True)
"""
global _verbose
_verbose = bool
_verbose = bool_val


def set_out(io_stream):
Expand All @@ -143,7 +137,6 @@ def set_out(io_stream):

out = StringIO()
memory_utils.set_out(out)

"""
global _OUT
_OUT = io_stream
Expand Down Expand Up @@ -177,16 +170,8 @@ def memory_watcher(it, limit=_MEMORY_LIMIT):

if memory crosses limit -- it will raise a :class:`MemoryToBigException`
"""
counter = 0
for value in it:
counter += 1
for counter, value in enumerate(it, start=1):
if _verbose:
print_memory("[{}] {}".format(counter, value))
check_memory(limit)
yield value