[yoda-svn] r558 - in trunk: . pyext pyext/yoda/include

[blackhole at projects.hepforge.org]

Author: buckley
Date: Mon Mar  4 12:59:19 2013
New Revision: 558

Log:
Minor tidying

Modified:
   trunk/configure.ac
   trunk/pyext/setup.py.in
   trunk/pyext/yoda/include/AnalysisObject.pyx

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	Sat Feb  2 16:19:21 2013	(r557)
+++ trunk/configure.ac	Mon Mar  4 12:59:19 2013	(r558)
@@ -52,7 +52,7 @@
   AZ_PYTHON_VERSION_ENSURE([2.4])
   PYTHON_VERSION=`$PYTHON -c "import sys; print '.'.join(map(str, sys.version_info@<:@:2@:>@));"`
   AC_SUBST(PYTHON_VERSION)
-  RIVET_PYTHONPATH=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(prefix='$prefix', plat_specific=True);"`
+  YODA_PYTHONPATH=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(prefix='$prefix', plat_specific=True);"`
   AC_SUBST(YODA_PYTHONPATH)
   ## Test for Python header
   if test -x "$PYTHON"; then

Modified: trunk/pyext/setup.py.in
==============================================================================
--- trunk/pyext/setup.py.in	Sat Feb  2 16:19:21 2013	(r557)
+++ trunk/pyext/setup.py.in	Mon Mar  4 12:59:19 2013	(r558)
@@ -26,16 +26,16 @@
         include_dirs=[incdir, PKGNAME, boostdir],
         library_dirs=[srcdir, os.path.join(srcdir, '.libs')],
         libraries=['stdc++', 'YODA'])
- 
+
 
 # Make the templates
 make_templates('Axis1D_BIN1D_DBN',
-         dict(DBN='Dbn2D', BIN1D='ProfileBin1D'),
-         dict(DBN='Dbn1D', BIN1D='HistoBin1D'))
+               dict(DBN='Dbn2D', BIN1D='ProfileBin1D'),
+               dict(DBN='Dbn1D', BIN1D='HistoBin1D'))
 
 make_templates('Axis2D_BIN2D_DBN',
-         dict(DBN='Dbn3D', BIN2D='ProfileBin2D'),
-         dict(DBN='Dbn2D', BIN2D='HistoBin2D'))
+               dict(DBN='Dbn3D', BIN2D='ProfileBin2D'),
+               dict(DBN='Dbn2D', BIN2D='HistoBin2D'))
 
 make_templates('Bin1D_DBN', DBN=('Dbn1D', 'Dbn2D'))
 make_templates('Bin2D_DBN', DBN=('Dbn2D', 'Dbn3D'))
@@ -43,14 +43,9 @@
 header_files = glob('../include/YODA/*.h') + glob('../include/YODA/Utils/*.h')
 
 extns = [ext('util'),
-         ext('core', statics=[statics],
-             depends=glob('yoda/include/*.pyx') + header_files
-            )
-        ]
-
-setup(
-    name = PKGNAME,
-    ext_modules = extns,
-    cmdclass = dict(build_ext=build_ext),
-    packages = [PKGNAME]
-)
+         ext('core', statics=[statics], depends=glob('yoda/include/*.pyx') + header_files)]
+
+setup(name = PKGNAME,
+      ext_modules = extns,
+      cmdclass = dict(build_ext=build_ext),
+      packages = [PKGNAME])

Modified: trunk/pyext/yoda/include/AnalysisObject.pyx
==============================================================================
--- trunk/pyext/yoda/include/AnalysisObject.pyx	Sat Feb  2 16:19:21 2013	(r557)
+++ trunk/pyext/yoda/include/AnalysisObject.pyx	Mon Mar  4 12:59:19 2013	(r558)
@@ -21,7 +21,7 @@
     def annotations(self):
         """
         Key value pairs of metadata, returned as a Python dictionary.
-        
+
         """
         ana = self._AnalysisObject().annotations()
         it = ana.begin()
@@ -37,12 +37,12 @@
         stored in a YODA file.
 
         """
-        f = StringIO() 
+        f = StringIO()
         writeYODA([self], f)
         f.seek(0)
         return f.read().strip()
 
-    
+
     def updateAnnotations(self, E=None, **F):
         """
         AO.update([E, ]**F) -> None.  Update annotations of AO from