From 54a9a7c98e7bbf995201fc6f323ad45cb0ca20f2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 28 Jun 2013 12:44:44 +0530
Subject: [PATCH] pep8 and small perf improvement for human_readable()

---
 src/calibre/__init__.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py
index 5e940efcd9..07ad906247 100644
--- a/src/calibre/__init__.py
+++ b/src/calibre/__init__.py
@@ -310,9 +310,9 @@ def get_parsed_proxy(typ='http', debug=True):
     proxy = proxies.get(typ, None)
     if proxy:
         pattern = re.compile((
-            '(?:ptype://)?' \
-            '(?:(?P<user>\w+):(?P<pass>.*)@)?' \
-            '(?P<host>[\w\-\.]+)' \
+            '(?:ptype://)?'
+            '(?:(?P<user>\w+):(?P<pass>.*)@)?'
+            '(?P<host>[\w\-\.]+)'
             '(?::(?P<port>\d+))?').replace('ptype', typ)
         )
 
@@ -535,7 +535,7 @@ def entity_to_unicode(match, exceptions=[], encoding='cp1252',
     ent = match.group(1)
     if ent in exceptions:
         return '&'+ent+';'
-    if ent in {'apos', 'squot'}: # squot is generated by some broken CMS software
+    if ent in {'apos', 'squot'}:  # squot is generated by some broken CMS software
         return check("'")
     if ent == 'hellips':
         ent = 'hellip'
@@ -565,7 +565,7 @@ def entity_to_unicode(match, exceptions=[], encoding='cp1252',
         return '&'+ent+';'
 
 _ent_pat = re.compile(r'&(\S+?);')
-xml_entity_to_unicode = partial(entity_to_unicode, result_exceptions = {
+xml_entity_to_unicode = partial(entity_to_unicode, result_exceptions={
     '"' : '&quot;',
     "'" : '&apos;',
     '<' : '&lt;',
@@ -670,8 +670,8 @@ def human_readable(size, sep=' '):
     """ Convert a size in bytes into a human readable form """
     divisor, suffix = 1, "B"
     for i, candidate in enumerate(('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB')):
-        if size < 1024**(i+1):
-            divisor, suffix = 1024**(i), candidate
+        if size < (1 << ((i + 1) * 10)):
+            divisor, suffix = (1 << (i * 10)), candidate
             break
     size = str(float(size)/divisor)
     if size.find(".") > -1: