Take a look

.gitignore

@@ -1 +1,3 @@
 *.pyc
+*.swp
+*.swo

fixofx.py

@@ -1,13 +1,13 @@
 #!/usr/bin/env python
 
 # Copyright 2005-2010 Wesabe, Inc.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -57,67 +57,69 @@ def fixpath(filename):
     pass
 
 
-def convert(text, filetype, verbose=False, fid="UNKNOWN", org="UNKNOWN", 
+def convert(filecontent, filetype, verbose=False, fid="UNKNOWN", org="UNKNOWN",
             bankid="UNKNOWN", accttype="UNKNOWN", acctid="UNKNOWN",
-            balance="UNKNOWN", curdef=None, lang="ENG", dayfirst=False, 
+            balance="UNKNOWN", curdef=None, lang="ENG", dayfirst=False,
             debug=False):
-
+
+    text = os.linesep.join(s for s in filecontent.splitlines() if s)
+
     # This finishes a verbosity message started by the caller, where the
     # caller explains the source command-line option and this explains the
     # source format.
-    if verbose: 
+    if verbose:
         sys.stderr.write("Converting from %s format.\n" % filetype)
 
     if options.debug and (filetype in ["OFC", "QIF"] or filetype.startswith("OFX")):
         sys.stderr.write("Starting work on raw text:\n")
         sys.stderr.write(rawtext + "\n\n")
-    
+
     if filetype.startswith("OFX/2"):
         if verbose: sys.stderr.write("No conversion needed; returning unmodified.\n")
-        
+
         # The file is already OFX 2 -- return it unaltered, ignoring
         # any of the parameters passed to this method.
         return text
-    
+
     elif filetype.startswith("OFX"):
         if verbose: sys.stderr.write("Converting to OFX/2.0...\n")
-        
+
         # This will throw a ParseException if it is unable to recognize
         # the source format.
-        response = ofx.Response(text, debug=debug)        
+        response = ofx.Response(text, debug=debug)
         return response.as_xml(original_format=filetype)
-    
+
     elif filetype == "OFC":
         if verbose: sys.stderr.write("Beginning OFC conversion...\n")
         converter = ofxtools.OfcConverter(text, fid=fid, org=org, curdef=curdef,
                                           lang=lang, debug=debug)
-        
+
         # This will throw a ParseException if it is unable to recognize
         # the source format.
-        if verbose: 
+        if verbose:
             sys.stderr.write("Converting to OFX/1.02...\n\n%s\n\n" %
                              converter.to_ofx102())
             sys.stderr.write("Converting to OFX/2.0...\n")
-                                             
+
         return converter.to_xml()
-    
+
     elif filetype == "QIF":
         if verbose: sys.stderr.write("Beginning QIF conversion...\n")
         converter = ofxtools.QifConverter(text, fid=fid, org=org,
-                                          bankid=bankid, accttype=accttype, 
-                                          acctid=acctid, balance=balance, 
+                                          bankid=bankid, accttype=accttype,
+                                          acctid=acctid, balance=balance,
                                           curdef=curdef, lang=lang, dayfirst=dayfirst,
                                           debug=debug)
-        
+
         # This will throw a ParseException if it is unable to recognize
         # the source format.
-        if verbose: 
+        if verbose:
             sys.stderr.write("Converting to OFX/1.02...\n\n%s\n\n" %
                              converter.to_ofx102())
             sys.stderr.write("Converting to OFX/2.0...\n")
-                                             
+
         return converter.to_xml()
-    
+
     else:
         raise TypeError("Unable to convert source format '%s'." % filetype)
 
@@ -148,6 +150,8 @@ def convert(text, filetype, verbose=False, fid="UNKNOWN", org="UNKNOWN",
                   help="(QIF only) Account balance to use in output")
 parser.add_option("--dayfirst", action="store_true", dest="dayfirst", default=False,
                   help="(QIF only) Parse dates day first (UK format)")
+parser.add_option("-s", "--string", dest="string", default=None,
+                  help="string to convert")
 (options, args) = parser.parse_args()
 
 #
@@ -168,9 +172,9 @@ def convert(text, filetype, verbose=False, fid="UNKNOWN", org="UNKNOWN",
 
 if options.filename:
     if os.path.isfile(options.filename):
-        if options.verbose: 
+        if options.verbose:
             sys.stderr.write("Reading from '%s'\n." % options.filename)
-        
+
         try:
             srcfile = open(options.filename, 'rU')
             rawtext = srcfile.read()
@@ -180,19 +184,24 @@ def convert(text, filetype, verbose=False, fid="UNKNOWN", org="UNKNOWN",
             print "Exiting."
             sys.stderr.write("fixofx failed with error code 1\n")
             sys.exit(1)
-        
+
     else:
         print "'%s' does not appear to be a file.  Try --help." % options.filename
         sys.stderr.write("fixofx failed with error code 2\n")
         sys.exit(2)
 
+elif options.string:
+    if options.verbose:
+        sys.stderr.write("Reading from string\n")
+    rawtext = options.string.replace('\r','')
+
 else:
-    if options.verbose: 
+    if options.verbose:
         sys.stderr.write("Reading from standard input.\n")
-    
+
     stdin_universal = os.fdopen(os.dup(sys.stdin.fileno()), "rU")
     rawtext = stdin_universal.read()
-    
+
     if rawtext == "" or rawtext is None:
         print "No input.  Pipe a file to convert to the script,\n" + \
               "or call with -f.  Call with --help for more info."
@@ -208,16 +217,16 @@ def convert(text, filetype, verbose=False, fid="UNKNOWN", org="UNKNOWN",
     # rather than parsing the file to make sure.  (Parsing will fail
     # below if the guess is wrong on OFX/1 and QIF.)
     filetype  = ofx.FileTyper(rawtext).trust()
-    
+
     if options.type:
         print "Input file type is %s." % filetype
         sys.exit(0)
     elif options.debug:
         sys.stderr.write("Input file type is %s.\n" % filetype)
-    
-    converted = convert(rawtext, filetype, verbose=options.verbose, 
-                        fid=options.fid, org=options.org, bankid=options.bankid, 
-                        accttype=options.accttype, acctid=options.acctid, 
+
+    converted = convert(rawtext, filetype, verbose=options.verbose,
+                        fid=options.fid, org=options.org, bankid=options.bankid,
+                        accttype=options.accttype, acctid=options.acctid,
                         balance=options.balance, curdef=options.curdef,
                         lang=options.lang, dayfirst=options.dayfirst,
                         debug=options.debug)

lib/ofx/__init__.py

@@ -1,11 +1,12 @@
+# coding: utf-8
 # Copyright 2005-2010 Wesabe, Inc.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

lib/ofx/account.py

@@ -1,11 +1,12 @@
+#coding: utf-8
 # Copyright 2005-2010 Wesabe, Inc.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

lib/ofx/builder.py

@@ -1,11 +1,12 @@
+#coding: utf-8
 # Copyright 2005-2010 Wesabe, Inc.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -121,7 +122,7 @@ def __call__(self, *values, **params):
 # also be added here, unfortunately.
 __all__ = ['ACCTID', 'ACCTINFORQ', 'ACCTINFOTRNRQ', 'ACCTTYPE', 'APPID',
 'APPVER', 'AVAILBAL', 'BALAMT', 'BANKACCTFROM', 'BANKID', 'BANKMSGSRQV1',
-'BANKMSGSRSV1', 'BANKTRANLIST', 'BROKERID', 'CCACCTFROM', 'CCSTMTENDRQ',
+'BANKMSGSRSV1', 'BANKTRANLIST', 'BROKERID', 'CATEGORY', 'CCACCTFROM', 'CCSTMTENDRQ',
 'CCSTMTENDTRNRQ', 'CCSTMTRQ', 'CCSTMTRS', 'CCSTMTTRNRQ', 'CCSTMTTRNRS',
 'CHARSET', 'CHECKNUM', 'CLIENTROUTING', 'CLTCOOKIE', 'CODE', 'COMPRESSION',
 'CREDITCARDMSGSRQV1', 'CREDITCARDMSGSRSV1', 'CURDEF', 'DATA', 'DOCUMENT',
@@ -152,6 +153,7 @@ def __call__(self, *values, **params):
 BANKMSGSRSV1       = Tag("BANKMSGSRSV1", aggregate=True)
 BANKTRANLIST       = Tag("BANKTRANLIST", aggregate=True)
 BROKERID           = Tag("BROKERID")
+CATEGORY           = Tag("CATEGORY")
 CCACCTFROM         = Tag("CCACCTFROM", aggregate=True)
 CCSTMTENDRQ        = Tag("CCSTMTENDRQ", aggregate=True)
 CCSTMTENDTRNRQ     = Tag("CCSTMTENDTRNRQ", aggregate=True)

lib/ofx/client.py

@@ -1,11 +1,12 @@
+#coding: utf-8
 # Copyright 2005-2010 Wesabe, Inc.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

lib/ofx/document.py

@@ -1,11 +1,12 @@
+#coding: utf-8
 # Copyright 2005-2010 Wesabe, Inc.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,15 +41,8 @@ def as_xml(self, original_format=None, date_format=None):
         # method so that we can start to survey what encodings
         # we're actually seeing, and use that to maybe be smarter
         # about this in the future.
-        encoding = ""
-        if self.parse_dict["header"]["ENCODING"] == "USASCII":
-            encoding = "US-ASCII"
-        elif self.parse_dict["header"]["ENCODING"] == "UNICODE":
-            encoding = "UTF-8"
-        elif self.parse_dict["header"]["ENCODING"] == "NONE":
-            encoding = "UTF-8"
-        else:
-            encoding = self.parse_dict["header"]["ENCODING"]
+        #forcing encoding to utf-8
+        encoding = "UTF-8"
 
         xml += """<?xml version="1.0" encoding="%s"?>\n""" % encoding
         xml += """<?OFX OFXHEADER="200" VERSION="200" """ + \

lib/ofx/error.py

@@ -1,20 +1,21 @@
+#coding: utf-8
 # Copyright 2005-2010 Wesabe, Inc.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 #
-# ofx.error - OFX error message exception 
-# 
+# ofx.error - OFX error message exception
+#
 
 
 class Error(Exception):
@@ -96,12 +97,12 @@ def __init__(self, summary, code=None, severity=None, message=None):
     def interpret_code(self, code=None):
         if code is None:
             code = self.code
-        
+
         if self.codetable.has_key(code):
             return self.codetable[code]
         else:
             return "Unknown error code"
-    
+
     def str(self):
         format = "%s\n(%s %s: %s)"
         return format % (self.msg, self.severity, self.code,