Changeset 9602 for src

Timestamp:

Aug 28, 2011, 9:01:12 PM (13 years ago)

Author:

rick

Message:

Saves a whole bunch of casting on a later stage.

File:

• src/django_gheat/gheat/management/commands/netstumbler.py (modified) (8 diffs)

src/django_gheat/gheat/management/commands/netstumbler.py

@@ -14 +14 @@
   
   def get_int32(size=1):
-    return unpack('<' + 'i'*size,fh.read(4*size))
+    v = unpack('<' + 'i'*size,fh.read(4*size))
+    return v[0] if size == 1 else v
   
   def get_uint32(size=1):
-    return unpack('<' + 'I'*size,fh.read(4*size))
+    v = unpack('<' + 'I'*size,fh.read(4*size))
+    return v[0] if size == 1 else v
   
   def get_uint64(size=1):
-    return unpack('<' + 'Q'*size,fh.read(8*size))
+    v = unpack('<' + 'Q'*size,fh.read(8*size))
+    return v[0] if size == 1 else v
   
   def get_uint8(size=1):
-    return unpack('<' + 'B'*size,fh.read(1*size))
+    v = unpack('<' + 'B'*size,fh.read(1*size))
+    return v[0] if size == 1 else v
   
   def get_filetime():
@@ -36 +40 @@
   
   def get_double(size=1):
-    return unpack('<' + 'd'*size,fh.read(8*size))
+    v = unpack('<' + 'd'*size,fh.read(8*size))
+    return v[0] if size == 1 else v
   
   data = {}
@@ -42 +47 @@
   data["dwSignature"] = get_char(4)
   data["dwFileVerunpack"] = get_uint32()
-  ApCount = get_uint32()[0]
+  ApCount = get_uint32()
   data["ApCount"] = ApCount
   
@@ -48 +53 @@
   for a in range(0,ApCount):
     ap = {}
-    SSIDLength = get_uint8()[0]
+    SSIDLength = get_uint8()
     ap["SSIDLength"] = SSIDLength
     ap["SSID"] = get_char(SSIDLength)
@@ -61 +66 @@
     ap["BestLat"] = get_double()
     ap["BestLong"] = get_double()
-    DataCount = get_uint32()[0]
+    DataCount = get_uint32()
     ap["DataCount"] = DataCount
     ap["measurement"] = []
@@ -69 +74 @@
       ms["Signal"] = get_int32()
       ms["Noice"] = get_int32()
-      LocationSource = get_int32()[0]
+      LocationSource = get_int32()
       ms["Location Source"] = LocationSource
       if LocationSource == 1:
@@ -81 +86 @@
         ms["Hdop"] = get_double()
       ap["measurement"].append(ms)
-    NameLength = get_uint8()[0]
+    NameLength = get_uint8()
     ap["NameLength"] = NameLength
     ap["Name"] = get_char(NameLength)
@@ -93 +98 @@
     ap["IPMask"] = get_uint32()
     ap["ApFlags"] = get_uint32()
-    IELength = get_uint32()[0]
+    IELength = get_uint32()
     ap["IELength"] = IELength
     ap["InformationElements"] = get_uint8(IELength)