[Pyphant-devel] SF.net SVN: pyphant:[661] trunk/src/workers/fmfile/fmfile/FMFLoader.py

[<zk...@us...>]

Revision: 661
          http://pyphant.svn.sourceforge.net/pyphant/?rev=661&view=rev
Author:   zklaus
Date:     2009-12-15 18:20:40 +0000 (Tue, 15 Dec 2009)

Log Message:
-----------
Merge branch 'master' into svn-trunk

* master:
  Enh: Added proper BOM treatment to FMFLoader.py

Modified Paths:
--------------
    trunk/src/workers/fmfile/fmfile/FMFLoader.py

Modified: trunk/src/workers/fmfile/fmfile/FMFLoader.py
===================================================================
--- trunk/src/workers/fmfile/fmfile/FMFLoader.py	2009-11-23 13:49:19 UTC (rev 660)
+++ trunk/src/workers/fmfile/fmfile/FMFLoader.py	2009-12-15 18:20:40 UTC (rev 661)
@@ -40,6 +40,7 @@
 # $Source$
 
 import zipfile, numpy, re, collections, copy, StringIO, os.path
+import codecs
 from pyphant.core import (Worker, Connectors,
                           Param, DataContainer)
 from pyphant.quantities.PhysicalQuantities import PhysicalQuantity,isPhysicalUnit,isPhysicalQuantity
@@ -460,6 +461,8 @@
     localVar = {'fmf-version':'1.0','coding':'utf-8',
                 'delimiter':'\t'}
     commentChar = ';'
+    if b.startswith(codecs.BOM_UTF8):
+        b = b.lstrip(codecs.BOM_UTF8)
     if b[0] == ';' or b[0] == '#':
         commentChar = b[0]
         items =  [var.strip().split(':') for var in b.split('-*-')[1].split(';')]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.