Fixes.

av1233 · Apr 12, 2013 · 8b36cc0 · 8b36cc0
1 parent 4f10ee1
commit 8b36cc0
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 13 deletions.
diff --git a/README b/README
@@ -76,7 +76,7 @@ Download
 
 A Mercurial repository can be found at:
 
-  https://hg.furius.ca/public/beancount/
+  http://hg.furius.ca/public/beancount/
 
 `Click here for download instructions. </web-furius/downloading.html>`_
 

diff --git a/TODO b/TODO
@@ -14,6 +14,10 @@
 Beancount (Accounting)
 ======================
 
+  - Remove support for virtual postings, hack not needed anymore!
+  - Remove support for BOOK <> IN ... do it now!
+
+
   - Support Ledger's aliases?
   - Support Ledger's "root account"?  I can only see it being useful for
     includes.

diff --git a/bin/bean-check-directories b/bin/bean-check-directories
@@ -25,19 +25,21 @@ def main():
     parser = optparse.OptionParser(__doc__.strip())
     cmdline.addopts(parser)
     opts, ledger, args = cmdline.main(parser, 1)
-    logging.basicConfig(level=logging.INFO, format='%(levelname)-8s: %(message)s')
+    logging.getLogger().setLevel(logging.INFO)
+    logging.info("TESTING")
+    print logging.getLogger().level, logging.INFO
 
     accounts = set(get_accounts(ledger))
     for arg in args:
         logging.info("Checking '%s'" % arg)
         for dname in find_files(arg):
             dircomps = dname.split('/')
             if not all(re.match('[A-Z].*', x) for x in dircomps):
-                logging.warn("Directory '%s' skipped." % dname)
+                logging.debug("Directory '%s' skipped." % dname)
                 continue
 
             if dircomps[0] == 'Misc':
-                logging.warn("Directory '%s' skipped." % dname)
+                logging.debug("Directory '%s' skipped." % dname)
                 continue
 
             aname = dname.replace('/', ':')

diff --git a/index.html b/index.html
@@ -89,7 +89,7 @@ <h1><a class="toc-backref" href="#id3">Demo</a></h1>
 <h1><a class="toc-backref" href="#id4">Download</a></h1>
 <p>A Mercurial repository can be found at:</p>
 <blockquote>
-<a class="reference external" href="https://hg.furius.ca/public/beancount/">https://hg.furius.ca/public/beancount/</a></blockquote>
+<a class="reference external" href="http://hg.furius.ca/public/beancount/">http://hg.furius.ca/public/beancount/</a></blockquote>
 <p><a class="reference external" href="/web-furius/downloading.html">Click here for download instructions.</a></p>
 </div>
 <div class="section" id="documentation">

diff --git a/lib/python/beancount/cwallet.cpp b/lib/python/beancount/cwallet.cpp
@@ -228,4 +228,3 @@ PyMODINIT_FUNC initcwallet(void)
     std::cout << "decimal_ctor = " << decimal_ctor << std::endl;
 
 }
-
diff --git a/lib/python/beancount/wallet.py b/lib/python/beancount/wallet.py
@@ -292,10 +292,11 @@ def _clean(w):
 
 
 
-try:
-    from beancount.cwallet import Wallet
-except ImportError:
-    logging.warning("Fast Wallet object not available; falling back on Python Wallet object.")
-    Wallet = _Wallet
-
-
+Wallet = _Wallet
+
+# FIXME: Disabled for now; this also screws up the logging level, info() doesn't show up somehow.
+# try:
+#     from beancount.cwallet import Wallet
+# except ImportError:
+#     logging.warning("Fast Wallet object not available; falling back on Python Wallet object.")
+#     Wallet = _Wallet
diff --git a/test/newfile.txt b/test/newfile.txt
Original file line number	Diff line number	Diff line change
Expand Up		@@ -228,4 +228,3 @@ PyMODINIT_FUNC initcwallet(void)
		std::cout << "decimal_ctor = " << decimal_ctor << std::endl;

		}