Regenerate file io py.

Author: mfine

python/sbp/file_io.py

@@ -77,7 +77,7 @@ def __init__(self, sbp=None, **kwargs):
     else:
       super( MsgFileioReadRequest, self).__init__()
       self.msg_type = SBP_MSG_FILEIO_READ_REQUEST
-      self.sender = kwargs.pop('sender', 0)
+      self.sender = kwargs.pop('sender', SENDER_ID)
       self.offset = kwargs.pop('offset')
       self.chunk_size = kwargs.pop('chunk_size')
       self.filename = kwargs.pop('filename')
@@ -244,15 +244,9 @@ def __init__(self, sbp=None, **kwargs):
       self.__dict__.update(sbp.__dict__)
       self.from_binary(sbp.payload)
     else:
-<<<<<<< HEAD
-      super( MsgFileioReadDir, self).__init__()
-      self.msg_type = SBP_MSG_FILEIO_READ_DIR
-      self.sender = kwargs.pop('sender', SENDER_ID)
-=======
       super( MsgFileioReadDirRequest, self).__init__()
       self.msg_type = SBP_MSG_FILEIO_READ_DIR_REQUEST
-      self.sender = kwargs.pop('sender', 0)
->>>>>>> New file_io messages remove bi-dir.
+      self.sender = kwargs.pop('sender', SENDER_ID)
       self.offset = kwargs.pop('offset')
       self.dirname = kwargs.pop('dirname')
 
@@ -335,7 +329,7 @@ def __init__(self, sbp=None, **kwargs):
     else:
       super( MsgFileioReadDirResponse, self).__init__()
       self.msg_type = SBP_MSG_FILEIO_READ_DIR_RESPONSE
-      self.sender = kwargs.pop('sender', 0)
+      self.sender = kwargs.pop('sender', SENDER_ID)
       self.offset = kwargs.pop('offset')
       self.dirname = kwargs.pop('dirname')
       self.contents = kwargs.pop('contents')
@@ -489,7 +483,7 @@ def __init__(self, sbp=None, **kwargs):
     else:
       super( MsgFileioWriteRequest, self).__init__()
       self.msg_type = SBP_MSG_FILEIO_WRITE_REQUEST
-      self.sender = kwargs.pop('sender', 0)
+      self.sender = kwargs.pop('sender', SENDER_ID)
       self.filename = kwargs.pop('filename')
       self.offset = kwargs.pop('offset')
       self.data = kwargs.pop('data')
@@ -568,15 +562,9 @@ def __init__(self, sbp=None, **kwargs):
       self.__dict__.update(sbp.__dict__)
       self.from_binary(sbp.payload)
     else:
-<<<<<<< HEAD
-      super( MsgFileioWrite, self).__init__()
-      self.msg_type = SBP_MSG_FILEIO_WRITE
-      self.sender = kwargs.pop('sender', SENDER_ID)
-=======
       super( MsgFileioWriteResponse, self).__init__()
       self.msg_type = SBP_MSG_FILEIO_WRITE_RESPONSE
-      self.sender = kwargs.pop('sender', 0)
->>>>>>> New file_io messages remove bi-dir.
+      self.sender = kwargs.pop('sender', SENDER_ID)
       self.filename = kwargs.pop('filename')
       self.offset = kwargs.pop('offset')
       self.data = kwargs.pop('data')
@@ -625,4 +613,4 @@ def to_json_dict(self):
   0x00AC: MsgFileioRemove,
   0x00AD: MsgFileioWriteRequest,
   0x00AB: MsgFileioWriteResponse,
-}
+}