[tor-commits] [bridgedb/master] PEP8 some whitespace fixes in bridgedb.Storage module.

isis at torproject.org isis at torproject.org
Fri May 1 07:10:59 UTC 2015


commit 3e860317f561ea7b2af81a1a3b707254ce6941c2
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Apr 21 22:47:09 2015 +0000

    PEP8 some whitespace fixes in bridgedb.Storage module.
---
 lib/bridgedb/Storage.py |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/bridgedb/Storage.py b/lib/bridgedb/Storage.py
index 439634f..732d8ab 100644
--- a/lib/bridgedb/Storage.py
+++ b/lib/bridgedb/Storage.py
@@ -189,14 +189,12 @@ class Database(object):
     def cleanEmailedBridges(self, expireBefore):
         cur = self._cur
         t = timeToStr(expireBefore)
-
         cur.execute("DELETE FROM EmailedBridges WHERE when_mailed < ?", (t,))
 
     def getEmailTime(self, addr):
         addr = hashlib.sha1(addr).hexdigest()
         cur = self._cur
-        cur.execute("SELECT when_mailed FROM EmailedBridges WHERE "
-                    "email = ?", (addr,))
+        cur.execute("SELECT when_mailed FROM EmailedBridges WHERE email = ?", (addr,))
         v = cur.fetchone()
         if v is None:
             return None
@@ -246,8 +244,7 @@ class Database(object):
     def getWarnedEmail(self, addr):
         addr = hashlib.sha1(addr).hexdigest()
         cur = self._cur
-        cur.execute("SELECT * FROM WarnedEmails WHERE "
-                    " email = ?", (addr,))
+        cur.execute("SELECT * FROM WarnedEmails WHERE email = ?", (addr,))
         v = cur.fetchone()
         if v is None:
             return False
@@ -261,8 +258,7 @@ class Database(object):
             cur.execute("INSERT INTO WarnedEmails"
                         "(email,when_warned) VALUES (?,?)", (addr, t,))
         elif warned == False:
-            cur.execute("DELETE FROM WarnedEmails WHERE "
-                        "email = ?", (addr,))
+            cur.execute("DELETE FROM WarnedEmails WHERE email = ?", (addr,))
 
     def cleanWarnedEmails(self, expireBefore):
         cur = self._cur
@@ -302,10 +298,13 @@ class Database(object):
 
     def getBridgesLastUpdatedBefore(self, statusPublicationMillis):
         cur = self._cur
-        v = cur.execute("SELECT * FROM BridgeHistory WHERE lastUpdatedWeightedTime < ?", (statusPublicationMillis,))
+        v = cur.execute("SELECT * FROM BridgeHistory WHERE lastUpdatedWeightedTime < ?",
+                        (statusPublicationMillis,))
         if v is None: return
         for h in v:
             yield BridgeHistory(h[0],IPAddress(h[1]),h[2],h[3],h[4],h[5],h[6],h[7],h[8],h[9],h[10])
+
+
 def openDatabase(sqlite_file):
     conn = sqlite3.Connection(sqlite_file)
     cur = conn.cursor()





More information about the tor-commits mailing list