Changeset 3295

Timestamp:

05/03/08 12:23:44 (2 months ago)

Author:

borning

Message:

fixed dependency from opus_core to urbansim package

Location:

trunk/opus_core/configurations

Files:

• test_configurations/__init__.py (copied) (copied from trunk/opus_core/configurations/__init__.py)
• test_configurations/child_scenario_oldparent.xml (modified) (2 diffs)
• test_configurations/old_style_configuration.py (added)
• xml_configuration.py (modified) (1 diff)

trunk/opus_core/configurations/test_configurations/child_scenario_oldparent.xml

@@ -4 +4 @@
     <test_scenario type="scenario">
       <parent_old_format type="dictionary">
-        <Class_name type="string">GeneralConfiguration</Class_name>
-        <Class_path type="string">urbansim.configs.general_configuration</Class_path>
+        <Class_name type="string">OldStyleConfiguration</Class_name>
+        <Class_path type="string">opus_core.configurations.test_configurations.old_style_configuration</Class_path>
       </parent_old_format>
       <years type="tuple">
@@ -11 +11 @@
         <endyear type="integer">1981</endyear>
       </years>
+      <squidcount type="integer">12</squidcount>
     </test_scenario>
   </scenario_manager>

trunk/opus_core/configurations/xml_configuration.py

@@ -492 +492 @@
         # 'years' is overridden in the child
         self.assertEqual(config['years'], (1980, 1981))
+        # 'squidcount' is new in the child
+        self.assertEqual(config['squidcount'], 12)
         # 'models' is inherited
         self.assert_('models' in config)