HappyCodeDay
diff --git a/‎bin/j2py‎
Lines changed: 9 additions & 8 deletions b/‎bin/j2py‎
Lines changed: 9 additions & 8 deletions
diff --git a/‎java2python/config/__init__.py‎
Lines changed: 2 additions & 0 deletions b/‎java2python/config/__init__.py‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎test/altconfigs/Class10.py‎ b/‎test/altconfigs/Class10.py‎
diff --git a/‎test/other_config_a.py‎ b/‎test/other_config_a.py‎
diff --git a/‎test/other_config_b.py‎ b/‎test/other_config_b.py‎
@@ -71,10 +71,11 @@ def main(options):
         fileout = '%s.py' % (path.splitext(filein)[0])
 
     configs = options.configs
-    if options.configdir and not isinstance(filein, file):
-        dirconfigname = configFromDir(filein, options.configdir)
-        if path.exists(dirconfigname):
-            configs.insert(0, dirconfigname)
+    if options.configdirs and not isinstance(filein, file):
+        for configdir in options.configdirs:
+            dirname = configFromDir(filein, configdir)
+            if path.exists(dirname):
+                configs.insert(0, dirname)
     if options.includedefaults:
         configs.insert(0, 'java2python.config.default')
 
@@ -183,11 +184,10 @@ def config(argv):
         metavar='OUTPUTFILE', default=None)
     add('-c', '--config', dest='configs',
         help='Use CONFIG file or module.  May be repeated.',
-        metavar='CONFIG', default=[],
-        action='append')
-    add('-d', '--configdir', dest='configdir',
+        metavar='CONFIG', default=[], action='append')
+    add('-d', '--configdir', dest='configdirs',
         help='Use DIR to match input filename with config filename.',
-        metavar='DIR', default=None)
+        metavar='DIR', default=[], action='append')
     add('-f', '--profile', dest='profile',
         help='Profile execution and print results to stderr.',
         default=False, action='store_true')
@@ -223,6 +223,7 @@ def config(argv):
         ns.inputfile = sys.stdin
     if ns.outputfile == '-':
         ns.outputfile = sys.stdout
+
     configColors(ns.nocolor)
     configLogging(ns.loglevel)
     return ns
 
@@ -12,6 +12,8 @@ class Config(object):
 
     def __init__(self, names):
         self.configs = [self.load(name) for name in names]
+        for config in self.configs:
+            print '## CONFIG', config
 
     def every(self, key, default=None):
         """ Returns the value at the given key from each config module. """