Changeset 172:c17d7f396cf6
- Timestamp:
- 08/27/08 16:04:00 (2 years ago)
- Author:
- rgrp
- Branch:
- default
- convert_revision:
- svn:10edda23-d834-0410-9182-b00384516d49/trunk@184
- Message:
-
[data][s]: move microfacts/tests/data to microfacts/data so data can be used running tests/init.py (which overrides config setup!).
- Location:
- microfacts
- Files:
-
Legend:
- Unmodified
- Added
- Removed
-
|
r138
|
r172
|
|
| 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) |
-
|
r160
|
r172
|
|
| 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) |
-
|
r164
|
r172
|
|
| 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) |
-
|
r168
|
r172
|
|
| 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() |
