More work on configs.

Troy Melhase · Troy Melhase · commit ab3c58b570b1 · 2012-02-02T22:35:53.000-05:00
diff --git a/java2python/config/__init__.py b/java2python/config/__init__.py
@@ -12,8 +12,6 @@ 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. """
diff --git a/test/Makefile b/test/Makefile
@@ -35,7 +35,7 @@ parsers:
 
 
 %.py: %.class
-	@$(j2py) $(addsuffix .java, $(basename $@)) $@ -c configs/__init__.py -d configs
+	@$(j2py) $(addsuffix .java, $(basename $@)) $@ -c configs/defaults.py -d configs
 
 %: %.py
 	@bash -c "diff -q <($(python) $(addsuffix .py, $@)) <(java -ea $@)" && echo "[PASS] $@"
diff --git a/test/configs/__init__.py b/test/configs/__init__.py
@@ -1,31 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-from java2python.config import default
-
-
-modulePrologueHandlers = default.modulePrologueHandlers + [
-    'from configs.overloading import overloaded',
-    'from abc import ABCMeta, abstractmethod',
-    'import zope.interface',
-]
-
-
-outputSubs = [
-    (r'(.*?)\.getMessage\(\)', r'\1.message'),
-    (r'(.*?)(\w+?)\.length(.*)', r'\1len(\2)\3'),
-    (r'assertEquals', 'self.assertEquals'),
-    (r'## import junit.framework', 'from unittest import *'),
-    (r'(.*?)\.getClass\(\)', r'\1.__class__'),
-    (r'(.*?)\.getName\(\)', r'\1.__name__'),
-    (r'(.*?)\.getInterfaces\(\)', r'\1.__bases__'),
-
-    (r'(.*?)\.fooProp\(\)', r'\1.fooProp'),
-    (r'(.*?)\.fooProp\((.+)\)', r'\1.fooProp = \2'),
-
-    (r'(.*?)lock(.*?) = object\(\)', r'\1lock\2 = Lock()'),
-
-    ## these two fudge something that should be handled in parsing
-    (r'(.*?)StaticInner\(\)', r'\1cls.StaticInner()'),
-    (r'(.*?)outer\.cls', r'\1outer'),
-    (r'from java\.util import \*', ''),
-    ]
diff --git a/test/configs/defaults.py b/test/configs/defaults.py
@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+from java2python.config import default
+
+
+modulePrologueHandlers = default.modulePrologueHandlers + [
+    'from configs.overloading import overloaded',
+    'from abc import ABCMeta, abstractmethod',
+    'import zope.interface',
+]
+
+
+outputSubs = [
+    (r'(.*?)\.getMessage\(\)', r'\1.message'),
+    (r'(.*?)(\w+?)\.length(.*)', r'\1len(\2)\3'),
+    (r'assertEquals', 'self.assertEquals'),
+    (r'## import junit.framework', 'from unittest import *'),
+    (r'(.*?)\.getClass\(\)', r'\1.__class__'),
+    (r'(.*?)\.getName\(\)', r'\1.__name__'),
+    (r'(.*?)\.getInterfaces\(\)', r'\1.__bases__'),
+
+    (r'(.*?)\.fooProp\(\)', r'\1.fooProp'),
+    (r'(.*?)\.fooProp\((.+)\)', r'\1.fooProp = \2'),
+
+    (r'(.*?)lock(.*?) = object\(\)', r'\1lock\2 = Lock()'),
+
+    ## these two fudge something that should be handled in parsing
+    (r'(.*?)StaticInner\(\)', r'\1cls.StaticInner()'),
+    (r'(.*?)outer\.cls', r'\1outer'),
+    (r'from java\.util import \*', ''),
+    ]
