[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] applications/PyHLA GetPackagesPath.py hla/omt/r...
From: |
CERTI CVS commits |
Subject: |
[certi-cvs] applications/PyHLA GetPackagesPath.py hla/omt/r... |
Date: |
Mon, 19 Sep 2011 12:56:34 +0000 |
CVSROOT: /sources/certi
Module name: applications
Changes by: Eric NOULARD <erk> 11/09/19 12:56:34
Modified files:
PyHLA : GetPackagesPath.py
PyHLA/hla/omt : record.py array.py basic.py
Log message:
Merge patch #7617: OMT type conversion for Python3
Python3 compatible GetPackagesPath.py
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/applications/PyHLA/GetPackagesPath.py?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/applications/PyHLA/hla/omt/record.py?cvsroot=certi&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/applications/PyHLA/hla/omt/array.py?cvsroot=certi&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/applications/PyHLA/hla/omt/basic.py?cvsroot=certi&r1=1.1&r2=1.2
Patches:
Index: GetPackagesPath.py
===================================================================
RCS file: /sources/certi/applications/PyHLA/GetPackagesPath.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- GetPackagesPath.py 6 Nov 2008 15:16:28 -0000 1.1
+++ GetPackagesPath.py 19 Sep 2011 12:56:33 -0000 1.2
@@ -1,3 +1,3 @@
# Script used by CMakeLists.txt to determine PYTHON_PACKAGES_PATH
from distutils.sysconfig import get_python_lib
-print get_python_lib().replace('\\','/')
+print(get_python_lib().replace('\\','/'))
Index: hla/omt/record.py
===================================================================
RCS file: /sources/certi/applications/PyHLA/hla/omt/record.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- hla/omt/record.py 23 Jun 2011 18:45:37 -0000 1.4
+++ hla/omt/record.py 19 Sep 2011 12:56:33 -0000 1.5
@@ -11,7 +11,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
-# $Id: record.py,v 1.4 2011/06/23 18:45:37 gotthardp Exp $
+# $Id: record.py,v 1.5 2011/09/19 12:56:33 erk Exp $
from hla._omt import *
from .basic import *
@@ -44,9 +44,9 @@
return self._octetBoundary
def pack(self, value):
- buffer = ""
+ buffer = bytes()
for fieldName, fieldType in self.fields:
- buffer += padding(len(buffer), fieldType.octetBoundary)*'\0'
+ buffer += padding(len(buffer), fieldType.octetBoundary) *
bytes("\0", encoding='utf-8')
buffer += fieldType.pack(value[fieldName])
return buffer
@@ -102,10 +102,10 @@
buffer = self.discriminantType.pack(value[self.discriminantName])
fieldName, fieldType =
self.getAlternative(value[self.discriminantName])
if(fieldName != None):
- buffer += padding(len(buffer), fieldType.octetBoundary)*'\0'
+ buffer += padding(len(buffer), fieldType.octetBoundary) *
bytes("\0", encoding='utf-8')
buffer += fieldType.pack(value[fieldName])
else:
- buffer += padding(len(buffer), self.octetBoundary)*'\0'
+ buffer += padding(len(buffer), self.octetBoundary) * bytes("\0",
encoding='utf-8')
return buffer
def unpack(self, buffer, offset = 0):
@@ -121,4 +121,4 @@
buffer += padding(len(buffer), self.octetBoundary)*'\0'
return value, size
-# $Id: record.py,v 1.4 2011/06/23 18:45:37 gotthardp Exp $
+# $Id: record.py,v 1.5 2011/09/19 12:56:33 erk Exp $
Index: hla/omt/array.py
===================================================================
RCS file: /sources/certi/applications/PyHLA/hla/omt/array.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- hla/omt/array.py 23 Jun 2011 18:45:37 -0000 1.4
+++ hla/omt/array.py 19 Sep 2011 12:56:33 -0000 1.5
@@ -11,7 +11,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
-# $Id: array.py,v 1.4 2011/06/23 18:45:37 gotthardp Exp $
+# $Id: array.py,v 1.5 2011/09/19 12:56:33 erk Exp $
from hla._omt import *
from .basic import *
@@ -37,12 +37,12 @@
return self.elementType.octetBoundary
def pack(self, value):
- buffer = ""
+ buffer = bytes()
if(len(value) != self.cardinality):
raise TypeError("expecting %i elements" % (self.cardinality))
for element in value:
- buffer += padding(len(buffer), self.elementType.octetBoundary)*'\0'
+ buffer += padding(len(buffer), self.elementType.octetBoundary) *
bytes("\0", encoding='utf-8')
buffer += self.elementType.pack(element)
return buffer
@@ -74,7 +74,7 @@
raise TypeError("expecting %i elements" % (self.cardinality))
for element in value:
- buffer += padding(len(buffer), self.elementType.octetBoundary)*'\0'
+ buffer += padding(len(buffer), self.elementType.octetBoundary)*
bytes("\0", encoding='utf-8')
buffer += self.elementType.pack(element)
return buffer
@@ -92,4 +92,4 @@
return value, size
-# $Id: array.py,v 1.4 2011/06/23 18:45:37 gotthardp Exp $
+# $Id: array.py,v 1.5 2011/09/19 12:56:33 erk Exp $
Index: hla/omt/basic.py
===================================================================
RCS file: /sources/certi/applications/PyHLA/hla/omt/basic.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- hla/omt/basic.py 25 Sep 2008 17:17:44 -0000 1.1
+++ hla/omt/basic.py 19 Sep 2011 12:56:33 -0000 1.2
@@ -11,10 +11,17 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
-# $Id: basic.py,v 1.1 2008/09/25 17:17:44 gotthardp Exp $
+# $Id: basic.py,v 1.2 2011/09/19 12:56:33 erk Exp $
def padding(size, boundary):
return boundary - ((size-1)%boundary + 1)
-# $Id: basic.py,v 1.1 2008/09/25 17:17:44 gotthardp Exp $
+# Test Python version and define the 'bytes' operator accordingly
+from sys import version_info
+
+if version_info < (3,0):
+ def bytes(string='', encoding="utf-8"):
+ return string
+
+# $Id: basic.py,v 1.2 2011/09/19 12:56:33 erk Exp $
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] applications/PyHLA GetPackagesPath.py hla/omt/r...,
CERTI CVS commits <=