Changeset 184
- Timestamp:
- 08/27/08 17:04:00 (3 months ago)
- Files:
-
- trunk/microfacts/data (moved) (moved from trunk/microfacts/tests/data)
- trunk/microfacts/lib/cli.py (modified) (1 diff)
- trunk/microfacts/tests/functional/test_factlet.py (modified) (1 diff)
- trunk/microfacts/tests/functional/test_thread.py (modified) (1 diff)
- trunk/microfacts/tests/test_json.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/microfacts/lib/cli.py
r147 r184 68 68 import microfacts.model as model 69 69 import microfacts.lib.json 70 data = pkg_resources.resource_stream('microfacts .tests',70 data = pkg_resources.resource_stream('microfacts', 71 71 'data/bloomsbury.js') 72 72 out = microfacts.lib.json.load(data) trunk/microfacts/tests/functional/test_factlet.py
r170 r184 10 10 import pkg_resources 11 11 sample = pkg_resources.resource_stream( 12 'microfacts .tests', 'data/napoleon.js'12 'microfacts', 'data/napoleon.js' 13 13 ) 14 14 out = microfacts.lib.json.load(sample) trunk/microfacts/tests/functional/test_thread.py
r174 r184 10 10 import pkg_resources 11 11 sample = pkg_resources.resource_stream( 12 'microfacts .tests', 'data/napoleon2.js'12 'microfacts', 'data/napoleon2.js' 13 13 ) 14 14 out = microfacts.lib.json.load(sample) trunk/microfacts/tests/test_json.py
r178 r184 99 99 model.Session.clear() 100 100 model.Session.begin() 101 self.data = pkg_resources.resource_stream('microfacts .tests', 'data/napoleon.js')101 self.data = pkg_resources.resource_stream('microfacts', 'data/napoleon.js') 102 102 self.converter = json.FactletConverter() 103 103 … … 123 123 model.Session.clear() 124 124 model.Session.begin() 125 self.data = pkg_resources.resource_stream('microfacts .tests',125 self.data = pkg_resources.resource_stream('microfacts', 126 126 'data/napoleon2.js') 127 127 self.converter = json.ThreadConverter()
