/[thuban]/branches/WIP-pyshapelib-bramz/test/test_load.py
ViewVC logotype

Diff of /branches/WIP-pyshapelib-bramz/test/test_load.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1642 by bh, Mon Aug 25 10:54:31 2003 UTC revision 1970 by bh, Mon Nov 24 18:36:00 2003 UTC
# Line 34  import unittest Line 34  import unittest
34  import support  import support
35  support.initthuban()  support.initthuban()
36    
37    import postgissupport
38  from xmlsupport import sax_eventlist  from xmlsupport import sax_eventlist
39    
40  import dbflib  import dbflib
41    import shapelib
42    
43  from Thuban.Model.save import save_session  from Thuban.Model.save import save_session
44  from Thuban.Model.load import load_session, parse_color, LoadError  from Thuban.Model.load import load_session, parse_color, LoadError, \
45         LoadCancelled
46  from Thuban.Model.color import Transparent  from Thuban.Model.color import Transparent
47  from Thuban.Model.classification import ClassGroupProperties, ClassGroupRange,\  from Thuban.Model.classification import ClassGroupProperties, ClassGroupRange,\
48      ClassGroupSingleton, ClassGroupDefault      ClassGroupSingleton, ClassGroupDefault
49    from Thuban.Model.postgisdb import ConnectionError
50    from Thuban.Model.table import DBFTable, MemoryTable, \
51         FIELDTYPE_DOUBLE, FIELDTYPE_INT, FIELDTYPE_STRING, \
52         table_to_dbf
53    
54    
55  def filenames_equal(name1, name2):  def filenames_equal(name1, name2):
# Line 80  class LoadSessionTest(support.FileLoadTe Line 87  class LoadSessionTest(support.FileLoadTe
87          self.session = None          self.session = None
88    
89    
90      dtd = "http://thuban.intevation.org/dtds/thuban-0.9-dev.dtd"      dtd = "http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd"
91      thubanids = [((dtd, n), (None, "id")) for n in      thubanids = [((dtd, n), (None, "id")) for n in
92                   ["fileshapesource", "filetable", "jointable",                   ["fileshapesource", "filetable", "jointable",
93                    "derivedshapesource"]]                    "derivedshapesource"]]
# Line 90  class LoadSessionTest(support.FileLoadTe Line 97  class LoadSessionTest(support.FileLoadTe
97                       ("jointable", "right"),                       ("jointable", "right"),
98                       ("derivedshapesource", "table"),                       ("derivedshapesource", "table"),
99                       ("derivedshapesource", "shapesource")]]                       ("derivedshapesource", "shapesource")]]
100        filenames = [((dtd, n), (None, m)) for n, m in
101                     [("fileshapesource", "filename"),
102                      ("rasterlayer", "filename"),
103                      ("filetable", "filename")]]
104      del n, m, dtd      del n, m, dtd
105    
106      def check_format(self):      def check_format(self):
# Line 100  class LoadSessionTest(support.FileLoadTe Line 111  class LoadSessionTest(support.FileLoadTe
111          filename = self.temp_file_name(self.id() + ".roundtrip.thuban")          filename = self.temp_file_name(self.id() + ".roundtrip.thuban")
112          save_session(self.session, filename)          save_session(self.session, filename)
113          el1 = sax_eventlist(filename = filename, ids = self.thubanids,          el1 = sax_eventlist(filename = filename, ids = self.thubanids,
114                              idrefs = self.thubanidrefs)                              idrefs = self.thubanidrefs,
115                                filenames = self.filenames)
116          el2 = sax_eventlist(filename = self.filename(), ids = self.thubanids,          el2 = sax_eventlist(filename = self.filename(), ids = self.thubanids,
117                              idrefs = self.thubanidrefs)                              idrefs = self.thubanidrefs,
118                                filenames = self.filenames)
119          if 0:          if 0:
120              for a, b in zip(el1, el2):              for a, b in zip(el1, el2):
121                  print a != b and "***************" or ""                  print a != b and "***************" or ""
# Line 165  class ClassificationTest(LoadSessionTest Line 178  class ClassificationTest(LoadSessionTest
178    
179  class TestSingleLayer(LoadSessionTest):  class TestSingleLayer(LoadSessionTest):
180    
181        # Note: The use of & and non-ascii characters is deliberate. We
182        # want to test whether the loading code handles that correctly.
183      file_contents = '''\      file_contents = '''\
184  <?xml version="1.0" encoding="UTF-8"?>  <?xml version="1.0" encoding="UTF-8"?>
185  <!DOCTYPE session SYSTEM "thuban-0.9.dtd">  <!DOCTYPE session SYSTEM "thuban-1.0.dtd">
186  <session xmlns="http://thuban.intevation.org/dtds/thuban-0.9-dev.dtd"  <session xmlns="http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd"
187          title="single map&amp;layer">          title="Stra\xc3\x9fen &amp; Landmarken">
188      <fileshapesource filetype="shapefile" id="D1"      <fileshapesource filetype="shapefile" id="D1"
189          filename="../../Data/iceland/political.shp"/>          filename="../../Data/iceland/political.shp"/>
190      <map title="Test Map">      <map title="\xc3\x9cbersicht">
191          <projection name="Unknown">          <projection epsg="32627" name="WGS 84 / UTM zone 27N">
192              <parameter value="zone=26"/>              <parameter value="datum=WGS84"/>
193                <parameter value="ellps=WGS84"/>
194              <parameter value="proj=utm"/>              <parameter value="proj=utm"/>
195              <parameter value="ellps=clrk66"/>              <parameter value="units=m"/>
196                <parameter value="zone=27"/>
197          </projection>          </projection>
198          <layer shapestore="D1" visible="true"          <layer shapestore="D1" visible="true"
199                  stroke="#000000" title="My Layer" stroke_width="1"                  stroke="#000000" title="K\xc3\xbcste" stroke_width="1"
200                  fill="None"/>                  fill="None"/>
201      </map>      </map>
202  </session>  </session>
# Line 192  class TestSingleLayer(LoadSessionTest): Line 209  class TestSingleLayer(LoadSessionTest):
209          self.session = session          self.session = session
210    
211          # Check the title          # Check the title
212          eq(session.Title(), "single map&layer")          eq(session.Title(), "Stra\xdfen & Landmarken")
213    
214          # the session has one map.          # the session has one map.
215          maps = session.Maps()          maps = session.Maps()
# Line 200  class TestSingleLayer(LoadSessionTest): Line 217  class TestSingleLayer(LoadSessionTest):
217    
218          # Check the map's attributes          # Check the map's attributes
219          map = maps[0]          map = maps[0]
220          eq(map.Title(), "Test Map")          eq(map.Title(), "\xdcbersicht")
221            proj = map.GetProjection()
222            eq(proj.GetName(), "WGS 84 / UTM zone 27N")
223            eq(proj.EPSGCode(), "32627")
224            params = proj.GetAllParameters()
225            params.sort()
226            eq(params, ["datum=WGS84", "ellps=WGS84", "proj=utm", "units=m",
227                        "zone=27"])
228    
229          # the map has a single layer          # the map has a single layer
230          layers = map.Layers()          layers = map.Layers()
# Line 208  class TestSingleLayer(LoadSessionTest): Line 232  class TestSingleLayer(LoadSessionTest):
232    
233          # Check the layer attributes          # Check the layer attributes
234          layer = layers[0]          layer = layers[0]
235          eq(layer.Title(), "My Layer")          eq(layer.Title(), "K\xfcste")
236          self.failUnless(filenames_equal(layer.ShapeStore().FileName(),          self.failUnless(filenames_equal(layer.ShapeStore().FileName(),
237                                          os.path.join(self.temp_dir(),                                          os.path.join(self.temp_dir(),
238                                                       os.pardir, os.pardir,                                                       os.pardir, os.pardir,
# Line 223  class TestSingleLayer(LoadSessionTest): Line 247  class TestSingleLayer(LoadSessionTest):
247          self.session.Destroy()          self.session.Destroy()
248          self.session = None          self.session = None
249    
250        def test_leak(self):
251            """Test load_session for resource leaks
252    
253            The load_session function had a resource leak in that it created
254            cyclic references. The objects would have been eventually
255            collected by the garbage collector but too late. One symptom is
256            that when layers are removed so that the last normal reference
257            owned indirectly by the session to a shape store goes away, the
258            shape store is not actually removed from the session even though
259            the session only keeps weak references because there are still
260            references owned by the cyclic garbage.
261            """
262            session = load_session(self.filename())
263            self.session = session
264    
265            # sanity check
266            self.assertEquals(len(session.ShapeStores()), 1)
267    
268            # remove the map. The shapestore should go away too
269            session.RemoveMap(session.Maps()[0])
270            self.assertEquals(len(session.ShapeStores()), 0)
271    
272    
273    class TestNonAsciiColumnName(LoadSessionTest):
274    
275        file_contents = '''\
276    <?xml version="1.0" encoding="UTF-8"?>
277    <!DOCTYPE session SYSTEM "thuban-1.0.dtd">
278    <session xmlns="http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd"
279            title="Non ASCII column name test">
280        <fileshapesource filetype="shapefile" id="D1"
281            filename="TestNonAsciiColumnName.shp"/>
282        <map title="map">
283            <projection name="Some Projection">
284                <parameter value="datum=WGS84"/>
285                <parameter value="ellps=WGS84"/>
286                <parameter value="proj=utm"/>
287                <parameter value="units=m"/>
288                <parameter value="zone=27"/>
289            </projection>
290            <layer shapestore="D1" visible="true"
291                    stroke="#000000" title="layer" stroke_width="1"
292                    fill="None">
293                <classification field="Fl\xc3\xa4che" field_type="double">
294                    <clnull label="">
295                        <cldata stroke="#000000" stroke_width="1" fill="None"/>
296                    </clnull>
297                </classification>
298            </layer>
299        </map>
300    </session>
301    '''
302    
303        def test(self):
304            """Load a session with a single map with a single layer"""
305    
306            # Create a shapefile and a dbffile with a non-ascii column name
307            dbffile = self.temp_file_name("TestNonAsciiColumnName.dbf")
308            shpfile = self.temp_file_name("TestNonAsciiColumnName.shp")
309            dbf = dbflib.create(dbffile)
310            dbf.add_field('Fl\xe4che', dbflib.FTDouble, 10, 5)
311            dbf.write_record(0, (0.0,))
312            dbf.close()
313            shp = shapelib.create(shpfile, shapelib.SHPT_POLYGON)
314            shp.write_object(-1, shapelib.SHPObject(shapelib.SHPT_POLYGON, 1,
315                                                    [[(0,0), (10, 10), (10, 0),
316                                                      (0, 0)]]))
317            shp.close()
318    
319            try:
320                session = load_session(self.filename())
321            except ValueError, v:
322                # Usually if the field name is not decoded properly the
323                # loading fails because the field type mentioned in the file
324                # is not None as returned from the layer for a non-existing
325                # column name so we check for that and report it as failure.
326                # Other exceptions are errors in the test case.
327                if str(v) == "xml field type differs from database!":
328                    self.fail("Cannot load file with non-ascii column names")
329                else:
330                    raise
331            self.session = session
332    
333            # In case Thuban could load the file anyway (i.e. no ValueError
334            # exception in load_session()), check explicitly whether the
335            # field name was decoded properly. The test will probably lead
336            # to a UnicodeError instead of a test failure so we check that
337            # too
338            layer = session.Maps()[0].Layers()[0]
339            try:
340                self.assertEquals(layer.GetClassificationColumn(), 'Fl\xe4che')
341            except UnicodeError:
342                # FIXME: Obviously this will have to change if Thuban ever
343                # supports unicode properly.
344                self.fail("Column name was not converted to a bytestring")
345    
346            # roundtrip check
347            self.check_format()
348    
349    
350  class TestLayerVisibility(LoadSessionTest):  class TestLayerVisibility(LoadSessionTest):
351    
352      file_contents = '''\      file_contents = '''\
353  <?xml version="1.0" encoding="UTF-8"?>  <?xml version="1.0" encoding="UTF-8"?>
354  <!DOCTYPE session SYSTEM "thuban-0.9.dtd">  <!DOCTYPE session SYSTEM "thuban-1.0.dtd">
355  <session xmlns="http://thuban.intevation.org/dtds/thuban-0.9-dev.dtd"  <session xmlns="http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd"
356          title="single map&amp;layer">          title="single map&amp;layer">
357      <fileshapesource filetype="shapefile" id="D1"      <fileshapesource filetype="shapefile" id="D1"
358          filename="../../Data/iceland/political.shp"/>          filename="../../Data/iceland/political.shp"/>
# Line 353  class TestLabels(ClassificationTest): Line 476  class TestLabels(ClassificationTest):
476    
477      file_contents = '''\      file_contents = '''\
478  <?xml version="1.0" encoding="UTF-8"?>  <?xml version="1.0" encoding="UTF-8"?>
479  <!DOCTYPE session SYSTEM "thuban-0.9.dtd">  <!DOCTYPE session SYSTEM "thuban-1.0.dtd">
480  <session xmlns="http://thuban.intevation.org/dtds/thuban-0.9-dev.dtd"  <session xmlns="http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd"
481          title="single map&amp;layer">          title="single map&amp;layer">
482      <fileshapesource filetype="shapefile" id="D1"      <fileshapesource filetype="shapefile" id="D1"
483          filename="../../Data/iceland/political.shp"/>          filename="../../Data/iceland/political.shp"/>
# Line 401  class TestLayerProjection(LoadSessionTes Line 524  class TestLayerProjection(LoadSessionTes
524    
525      file_contents = '''\      file_contents = '''\
526  <?xml version="1.0" encoding="UTF-8"?>  <?xml version="1.0" encoding="UTF-8"?>
527  <!DOCTYPE session SYSTEM "thuban-0.9.dtd">  <!DOCTYPE session SYSTEM "thuban-1.0.dtd">
528  <session xmlns="http://thuban.intevation.org/dtds/thuban-0.9-dev.dtd"  <session xmlns="http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd"
529          title="single map&amp;layer">          title="single map&amp;layer">
530      <fileshapesource filetype="shapefile" id="D2"      <fileshapesource filetype="shapefile" id="D2"
531          filename="../../Data/iceland/roads-line.shp"/>          filename="../../Data/iceland/roads-line.shp"/>
# Line 434  class TestLayerProjection(LoadSessionTes Line 557  class TestLayerProjection(LoadSessionTes
557                  title="My Layer" stroke_width="1" fill="None">                  title="My Layer" stroke_width="1" fill="None">
558              <projection name="Unknown">              <projection name="Unknown">
559                  <parameter value="proj=lcc"/>                  <parameter value="proj=lcc"/>
560                    <parameter value="lat_1=10"/>
561                    <parameter value="lat_2=20"/>
562                  <parameter value="ellps=clrk66"/>                  <parameter value="ellps=clrk66"/>
563              </projection>              </projection>
564          </layer>          </layer>
# Line 466  class TestLayerProjection(LoadSessionTes Line 591  class TestLayerProjection(LoadSessionTes
591          neq(proj, None)          neq(proj, None)
592          eq(proj.GetName(), "Unknown")          eq(proj.GetName(), "Unknown")
593          eq(proj.GetParameter("proj"), "lcc")          eq(proj.GetParameter("proj"), "lcc")
594            eq(proj.GetParameter("lat_1"), "10")
595            eq(proj.GetParameter("lat_2"), "20")
596          eq(proj.GetParameter("ellps"), "clrk66")          eq(proj.GetParameter("ellps"), "clrk66")
597    
598          self.check_format()          self.check_format()
# Line 475  class TestRasterLayer(LoadSessionTest): Line 602  class TestRasterLayer(LoadSessionTest):
602    
603      file_contents = '''\      file_contents = '''\
604  <?xml version="1.0" encoding="UTF-8"?>  <?xml version="1.0" encoding="UTF-8"?>
605  <!DOCTYPE session SYSTEM "thuban-0.9.dtd">  <!DOCTYPE session SYSTEM "thuban-1.0.dtd">
606  <session xmlns="http://thuban.intevation.org/dtds/thuban-0.9-dev.dtd"  <session xmlns="http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd"
607          title="single map&amp;layer">          title="single map&amp;layer">
608      <map title="Test Map">      <map title="Test Map">
609          <rasterlayer visible="false" filename="../../Data/iceland/island.tif"          <rasterlayer visible="false" filename="../../Data/iceland/island.tif"
# Line 509  class TestRasterLayer(LoadSessionTest): Line 636  class TestRasterLayer(LoadSessionTest):
636  class TestJoinedTable(LoadSessionTest):  class TestJoinedTable(LoadSessionTest):
637    
638      file_contents = '''<?xml version="1.0" encoding="UTF-8"?>      file_contents = '''<?xml version="1.0" encoding="UTF-8"?>
639  <!DOCTYPE session SYSTEM "thuban-0.9.dtd">  <!DOCTYPE session SYSTEM "thuban-1.0.dtd">
640  <session xmlns="http://thuban.intevation.org/dtds/thuban-0.9-dev.dtd" title="A Joined Table session">  <session xmlns="http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd" title="A Joined Table session">
641      <fileshapesource filetype="shapefile" id="D137227612"      <fileshapesource filetype="shapefile" id="D137227612"
642          filename="../../Data/iceland/roads-line.shp"/>          filename="../../Data/iceland/roads-line.shp"/>
643      <filetable filetype="DBF" filename="load_joinedtable.dbf" id="D136171140"      <filetable filetype="DBF" filename="load_joinedtable.dbf" id="D136171140"
# Line 554  class TestJoinedTable(LoadSessionTest): Line 681  class TestJoinedTable(LoadSessionTest):
681          self.check_format()          self.check_format()
682    
683    
684    
685    class TestPostGISLayer(LoadSessionTest):
686    
687        file_contents = '''<?xml version="1.0" encoding="UTF-8"?>
688    <!DOCTYPE session SYSTEM "thuban-1.0.dtd">
689    <session xmlns="http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd"
690            title="unnamed session">
691        <dbconnection port="%(port)s" host="%(host)s" user="%(user)s"
692            dbtype="postgis" id="D142684948" dbname="%(dbname)s"/>
693        <dbshapesource tablename="landmarks" id="D143149420" dbconn="D142684948"/>
694        <map title="unnamed map">
695            <layer shapestore="D143149420" visible="true" stroke="#000000"
696                    title="landmarks" stroke_width="1" fill="None"/>
697        </map>
698    </session>
699    '''
700    
701        def setUp(self):
702            """Extend the inherited method to start the postgis server
703    
704            Furthermore, patch the file contents with the real postgis db
705            information
706            """
707            postgissupport.skip_if_no_postgis()
708            self.server = postgissupport.get_test_server()
709            self.postgisdb = self.server.get_default_static_data_db()
710    
711            self.file_contents = self.__class__.file_contents % {
712                "dbname": self.postgisdb.dbname,
713                "user": self.server.user_name,
714                "port": self.server.port,
715                "host": self.server.host}
716            LoadSessionTest.setUp(self)
717    
718        def test(self):
719            """Test loading a session containing a postgis shapestore"""
720            session = load_session(self.filename())
721            self.session = session
722            connections = session.DBConnections()
723            self.assertEquals(len(connections), 1)
724            conn = connections[0]
725            for attr, value in [("host", self.server.host),
726                                ("port", str(self.server.port)),
727                                ("user", self.server.user_name),
728                                ("dbname", self.postgisdb.dbname)]:
729                self.assertEquals(getattr(conn, attr), value)
730            layer = session.Maps()[0].Layers()[0]
731            self.failUnless(layer.ShapeStore().DBConnection() is conn)
732    
733    
734    class TestPostGISLayerPassword(LoadSessionTest):
735    
736        file_contents = '''<?xml version="1.0" encoding="UTF-8"?>
737    <!DOCTYPE session SYSTEM "thuban-1.0.dtd">
738    <session xmlns="http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd"
739            title="unnamed session">
740        <dbconnection port="%(port)s" host="%(host)s" user="%(user)s"
741            dbtype="postgis" id="D142684948" dbname="%(dbname)s"/>
742        <dbshapesource tablename="landmarks" id="D143149420" dbconn="D142684948"/>
743        <map title="unnamed map">
744            <layer shapestore="D143149420" visible="true" stroke="#000000"
745                    title="landmarks" stroke_width="1" fill="None"/>
746        </map>
747    </session>
748    '''
749    
750        def setUp(self):
751            """Extend the inherited method to start the postgis server
752    
753            Furthermore, patch the file contents with the real postgis db
754            information
755            """
756            postgissupport.skip_if_no_postgis()
757            self.server = postgissupport.get_test_server()
758            self.postgisdb = self.server.get_default_static_data_db()
759    
760            self.file_contents = self.__class__.file_contents % {
761                "dbname": self.postgisdb.dbname,
762                "user": self.server.user_name,
763                "port": self.server.port,
764                "host": self.server.host}
765            LoadSessionTest.setUp(self)
766    
767            self.db_connection_callback_called = False
768            self.server.require_authentication(True)
769    
770        def tearDown(self):
771            """Extend the inherited method to switch off postgresql authentication
772            """
773            self.server.require_authentication(False)
774            LoadSessionTest.tearDown(self)
775    
776        def db_connection_callback(self, params, message):
777            """Implementation of Thuban.Model.hooks.query_db_connection_parameters
778            """
779            self.assertEquals(params,
780                              {"dbname": self.postgisdb.dbname,
781                               "user": self.server.user_name,
782                               "port": str(self.server.port),
783                               "host": self.server.host})
784            self.db_connection_callback_called = True
785            params = params.copy()
786            params["password"] = self.server.user_password
787            return params
788    
789        def test_with_callback(self):
790            """Test loading a session with postgis, authentication and a callback
791            """
792            session = load_session(self.filename(),
793                          db_connection_callback = self.db_connection_callback)
794            self.session = session
795            connections = session.DBConnections()
796            self.assertEquals(len(connections), 1)
797            conn = connections[0]
798            for attr, value in [("host", self.server.host),
799                                ("port", str(self.server.port)),
800                                ("user", self.server.user_name),
801                                ("dbname", self.postgisdb.dbname)]:
802                self.assertEquals(getattr(conn, attr), value)
803            layer = session.Maps()[0].Layers()[0]
804            self.failUnless(layer.ShapeStore().DBConnection() is conn)
805            self.failUnless(self.db_connection_callback_called)
806    
807        def test_without_callback(self):
808            """Test loading a session with postgis, authentication and no callback
809            """
810            # A password is required and there's no callback, so we should
811            # get a ConnectionError
812            self.assertRaises(ConnectionError, load_session, self.filename())
813    
814        def test_cancel(self):
815            """Test loading a session with postgis and cancelling authentication
816            """
817            def cancel(*args):
818                self.db_connection_callback_called = True
819                return None
820    
821            # If the user cancels, i.e. if the callbakc returns None, a
822            # LoadCancelled exception is raised.
823            self.assertRaises(LoadCancelled,
824                              load_session, self.filename(), cancel)
825            self.failUnless(self.db_connection_callback_called)
826    
827    
828  class TestLoadError(LoadSessionTest):  class TestLoadError(LoadSessionTest):
829    
830      file_contents = '''\      file_contents = '''\
831  <?xml version="1.0" encoding="UTF-8"?>  <?xml version="1.0" encoding="UTF-8"?>
832  <!DOCTYPE session SYSTEM "thuban-0.9.dtd">  <!DOCTYPE session SYSTEM "thuban-1.0.dtd">
833  <session xmlns="http://thuban.intevation.org/dtds/thuban-0.9-dev.dtd"  <session xmlns="http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd"
834          title="single map&amp;layer">          title="single map&amp;layer">
835      <fileshapesource id="D1" filename="../../Data/iceland/political.shp"/>      <fileshapesource id="D1" filename="../../Data/iceland/political.shp"/>
836      <map title="Test Map">      <map title="Test Map">
# Line 586  class TestLoadError(LoadSessionTest): Line 857  class TestLoadError(LoadSessionTest):
857              # LoadError really was about the missing attribute              # LoadError really was about the missing attribute
858              self.assertEquals(str(value),              self.assertEquals(str(value),
859                "Element "                "Element "
860                "(u'http://thuban.intevation.org/dtds/thuban-0.9-dev.dtd',"                "(u'http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd',"
861                " u'fileshapesource') requires an attribute 'filetype'")                " u'fileshapesource') requires an attribute 'filetype'")
862          else:          else:
863              self.fail("Missing filetype attribute doesn't raise LoadError")              self.fail("Missing filetype attribute doesn't raise LoadError")
864    
865  if __name__ == "__main__":  if __name__ == "__main__":
866      unittest.main()      support.run_tests()

Legend:
Removed from v.1642  
changed lines
  Added in v.1970

[email protected]
ViewVC Help
Powered by ViewVC 1.1.26