[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet-python] branch master updated: PEP fixes
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet-python] branch master updated: PEP fixes |
Date: |
Fri, 01 Dec 2017 21:28:03 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnunet-python.
The following commit(s) were added to refs/heads/master by this push:
new e46b690 PEP fixes
e46b690 is described below
commit e46b690de9baafbeaa52f178d361556298538172
Author: ng0 <address@hidden>
AuthorDate: Fri Dec 1 20:27:51 2017 +0000
PEP fixes
---
gnunet/strings.py | 173 +++++++++++++++++++++++++++---------------------------
1 file changed, 88 insertions(+), 85 deletions(-)
diff --git a/gnunet/strings.py b/gnunet/strings.py
index cfbdaa5..595c450 100644
--- a/gnunet/strings.py
+++ b/gnunet/strings.py
@@ -2,96 +2,99 @@ import datetime
from gnunet import *
+
encTable = "0123456789ABCDEFGHIJKLMNOPQRSTUV"
-def data_to_string(data):
- data = bytearray(data)
- size = len(data)
- bits = 0
- rpos = 0
- vbit = 0
- ret = ""
- while rpos < size:
- while rpos < size and vbit < 5:
- bits = (bits << 8) | data[rpos]
- rpos += 1
- vbit += 8
- while vbit >= 5:
- vbit -= 5
- ret += encTable[(bits >> vbit) & 31]
- if vbit > 0:
- ret += encTable[(bits << (5 - vbit)) & 31]
- return ret
-def string_to_data(s):
- s = str(s)
- size = len(s)
- bits = 0
- rpos = 0
- vbit = 0
- ret = bytearray([])
- try:
+def data_to_string(data):
+ data = bytearray(data)
+ size = len(data)
+ bits = 0
+ rpos = 0
+ vbit = 0
+ ret = ""
while rpos < size:
- while rpos < size and vbit < 8:
- bits = (bits << 5) | int(s[rpos], 32)
- rpos += 1
- vbit += 5
- while vbit >= 8:
- vbit -= 8
- ret.append((bits >> vbit) & 255)
+ while rpos < size and vbit < 5:
+ bits = (bits << 8) | data[rpos]
+ rpos += 1
+ vbit += 8
+ while vbit >= 5:
+ vbit -= 5
+ ret += encTable[(bits >> vbit) & 31]
if vbit > 0:
- if bits & ((1 << vbit) - 1) != 0:
- raise ValueError("")
- except ValueError:
- raise ValueError("'" + s + "' is not a valid data-encoding string")
- return ret
-
-def absolute_time_to_string(t):
- return t.strftime("%a %b %d %H:%M:%S %Y")
+ ret += encTable[(bits << (5 - vbit)) & 31]
+ return ret
-def string_to_absolute_time(s):
- if s == "end of time":
- return None
- try:
- return datetime.datetime.strptime(s, "%a %b %d %H:%M:%S %Y")
- except ValueError:
- pass
- try:
- return datetime.datetime.strptime(s, "%c")
- except ValueError:
- pass
- try:
- return datetime.datetime.strptime(s, "%Ec")
- except ValueError:
- pass
- try:
- return datetime.datetime.strptime(s, "%Y-%m-%d %H:%M:%S")
- except ValueError:
- pass
- try:
- return datetime.datetime.strptime(s, "%Y-%m-%d %H:%M")
- except ValueError:
- pass
- try:
- return datetime.datetime.strptime(s, "%x")
- except ValueError:
- pass
- try:
- return datetime.datetime.strptime(s, "%Ex")
- except ValueError:
- pass
- try:
- return datetime.datetime.strptime(s, "%Y-%m-%d")
- except ValueError:
- pass
- try:
- return datetime.datetime.strptime(s, "%Y-%m")
- except ValueError:
- pass
- try:
- return datetime.datetime.strptime(s, "%Y")
- except ValueError:
- pass
- raise ValueError("%s is not a properly formatted time string" % s)
+
+def string_to_data(s):
+ s = str(s)
+ size = len(s)
+ bits = 0
+ rpos = 0
+ vbit = 0
+ ret = bytearray([])
+ try:
+ while rpos < size:
+ while rpos < size and vbit < 8:
+ bits = (bits << 5) | int(s[rpos], 32)
+ rpos += 1
+ vbit += 5
+ while vbit >= 8:
+ vbit -= 8
+ ret.append((bits >> vbit) & 255)
+ if vbit > 0:
+ if bits & ((1 << vbit) - 1) != 0:
+ raise ValueError("")
+ except ValueError:
+ raise ValueError("'" + s + "' is not a valid data-encoding string")
+ return ret
+
+
+def absolute_time_to_string(t):
+ return t.strftime("%a %b %d %H:%M:%S %Y")
+def string_to_absolute_time(s):
+ if s == "end of time":
+ return None
+ try:
+ return datetime.datetime.strptime(s, "%a %b %d %H:%M:%S %Y")
+ except ValueError:
+ pass
+ try:
+ return datetime.datetime.strptime(s, "%c")
+ except ValueError:
+ pass
+ try:
+ return datetime.datetime.strptime(s, "%Ec")
+ except ValueError:
+ pass
+ try:
+ return datetime.datetime.strptime(s, "%Y-%m-%d %H:%M:%S")
+ except ValueError:
+ pass
+ try:
+ return datetime.datetime.strptime(s, "%Y-%m-%d %H:%M")
+ except ValueError:
+ pass
+ try:
+ return datetime.datetime.strptime(s, "%x")
+ except ValueError:
+ pass
+ try:
+ return datetime.datetime.strptime(s, "%Ex")
+ except ValueError:
+ pass
+ try:
+ return datetime.datetime.strptime(s, "%Y-%m-%d")
+ except ValueError:
+ pass
+ try:
+ return datetime.datetime.strptime(s, "%Y-%m")
+ except ValueError:
+ pass
+ try:
+ return datetime.datetime.strptime(s, "%Y")
+ except ValueError:
+ pass
+ raise ValueError("%s is not a properly formatted time string" % s)
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [gnunet-python] branch master updated: PEP fixes,
gnunet <=