[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone3-274-gd9a0e57

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit e8ad25f2e36e31e0a8afe08fbe11e54b9305aa8f
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Tue Oct 28 07:37:22 2008 +0100

    ogsmd: 'dir' is a builtin in Python, don't shadow it

diff --git a/framework/subsystems/ogsmd/modems/abstract/mediator.py b/framework/subsystems/ogsmd/modems/abstract/mediator.py
index 04a7189..703d70b 100644
--- a/framework/subsystems/ogsmd/modems/abstract/mediator.py
+++ b/framework/subsystems/ogsmd/modems/abstract/mediator.py
@@ -760,14 +760,14 @@ class SimRetrieveMessagebook( SimMediator ):
                     index = int(header.groupdict()["index"])
                     status = const.SMS_PDU_STATUS_OUT[int(header.groupdict()["status"])]
                     if "read" in status:
-                      dir = "MT"
+                      direction = "MT"
                     else:
-                      dir = "MO"
+                      direction = "MO"
                     length = int(header.groupdict()["pdulen"])
                 else:
                     # Now we decode the actual PDU
 
-                    sms = ogsmd.gsm.sms.decodeSMS( line, dir)
+                    sms = ogsmd.gsm.sms.decodeSMS( line, direction)
                     result.append( ( index, status, str(sms.oa), sms.ud, sms.featureMap ) )
             self._ok( result )
         else:
@@ -791,13 +791,13 @@ class SimRetrieveMessage( SimMediator ):
                     header = const.PAT_SMS_PDU_HEADER_SINGLE.match( self._rightHandSide(line) )
                     status = const.SMS_PDU_STATUS_OUT[int(header.groupdict()["status"])]
                     if status <= 1:
-                      dir = "MT"
+                      direction = "MT"
                     else:
-                      dir = "MO"
+                      direction = "MO"
                     length = int(header.groupdict()["pdulen"])
                 else:
                     # Now we decode the actual PDU
-                    sms = ogsmd.gsm.sms.decodeSMS( line, dir )
+                    sms = ogsmd.gsm.sms.decodeSMS( line, direction )
                     result = ( status, str(sms.oa), sms.ud, sms.featureMap )
 
             self._ok( *result )

-- 
FSO frameworkd Debian packaging