[Thuban-commits] r2837 - in trunk/thuban: . Doc/technotes Thuban/Model test
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Feb 13 23:31:33 CET 2008
Author: bernhard
Date: 2008-02-13 23:31:31 +0100 (Wed, 13 Feb 2008)
New Revision: 2837
Modified:
trunk/thuban/ChangeLog
trunk/thuban/Doc/technotes/release_process.txt
trunk/thuban/Thuban/Model/load.py
trunk/thuban/setup.py
trunk/thuban/test/test_save.py
Log:
* test/test_save.py, Thuban/Model/load.py, setup.py:
Mixed tabs and spaces indentation is bad, thus removed the tabs
from these inconsistant files.
* Doc/technotes/release_process.txt: Better use thuban-announce@
to announce. ;)
Modified: trunk/thuban/ChangeLog
===================================================================
--- trunk/thuban/ChangeLog 2008-02-04 18:31:30 UTC (rev 2836)
+++ trunk/thuban/ChangeLog 2008-02-13 22:31:31 UTC (rev 2837)
@@ -1,3 +1,12 @@
+2008-02-13 Bernhard Reiter <bernhard at intevation.de>
+
+ * test/test_save.py, Thuban/Model/load.py, setup.py:
+ Mixed tabs and spaces indentation is bad, thus removed the tabs
+ from these inconsistant files.
+
+ * Doc/technotes/release_process.txt: Better use thuban-announce@
+ to announce. ;)
+
2008-02-03 Bernhard Reiter <bernhard at intevation.de>
* Thuban/version.py, setup.py: Changing version number back to svn
Modified: trunk/thuban/Doc/technotes/release_process.txt
===================================================================
--- trunk/thuban/Doc/technotes/release_process.txt 2008-02-04 18:31:30 UTC (rev 2836)
+++ trunk/thuban/Doc/technotes/release_process.txt 2008-02-13 22:31:31 UTC (rev 2837)
@@ -91,7 +91,7 @@
- Write announcement including all major improvements.
Old: - Send announcement to following mailing lists:
- thuban-list at intevation.de
+ thuban-announce at intevation.de
freegis-list at intevation.de
- Have a beer and thank all contributors :-)
Modified: trunk/thuban/Thuban/Model/load.py
===================================================================
--- trunk/thuban/Thuban/Model/load.py 2008-02-04 18:31:30 UTC (rev 2836)
+++ trunk/thuban/Thuban/Model/load.py 2008-02-13 22:31:31 UTC (rev 2837)
@@ -161,9 +161,9 @@
"""Clear all instance variables to cut cyclic references.
The GC would have collected the loader eventually but it can
- happen that it doesn't run at all until Thuban is closed (2.3
- but not 2.2 tries a bit harder and forces a collection when the
- interpreter terminates)
+ happen that it doesn't run at all until Thuban is closed (2.3
+ but not 2.2 tries a bit harder and forces a collection when the
+ interpreter terminates)
"""
self.__dict__.clear()
@@ -528,8 +528,8 @@
self.aLayer = None
def start_classification(self, name, qname, attrs):
- # field and field_type are optional because the classification
- # can also be empty, ie. have only a default.
+ # field and field_type are optional because the classification
+ # can also be empty, ie. have only a default.
attrs = self.check_attrs(name, attrs,
[AttrDesc("field", False),
AttrDesc("field_type", False)])
@@ -537,7 +537,7 @@
field = attrs["field"]
fieldType = attrs["field_type"]
- if field == "": return # no need to set classification column.
+ if field == "": return # no need to set classification column.
dbFieldType = self.aLayer.GetFieldType(field)
Modified: trunk/thuban/setup.py
===================================================================
--- trunk/thuban/setup.py 2008-02-04 18:31:30 UTC (rev 2836)
+++ trunk/thuban/setup.py 2008-02-13 22:31:31 UTC (rev 2837)
@@ -324,8 +324,8 @@
#add the Lib content to the output
if os.path.isdir("Lib"):
- for d in os.listdir("Lib"):
- data_files.append(("Lib", ["Lib/"+d]))
+ for d in os.listdir("Lib"):
+ data_files.append(("Lib", ["Lib/"+d]))
#
@@ -942,14 +942,14 @@
# Obviously have to build before we can install
# add gdal to the build
- for (dirpath, dnames, fnames) in os.walk('gdal'):
- files_in_dir = []
- dp = '/'.join(dirpath.split('\\'))
- for f in fnames:
- if os.path.isfile(os.path.join(dirpath,f)):
- files_in_dir.append( dp + '/' + f)
- if len(files_in_dir) > 0:
- data_files.append(( dp , files_in_dir))
+ for (dirpath, dnames, fnames) in os.walk('gdal'):
+ files_in_dir = []
+ dp = '/'.join(dirpath.split('\\'))
+ for f in fnames:
+ if os.path.isfile(os.path.join(dirpath,f)):
+ files_in_dir.append( dp + '/' + f)
+ if len(files_in_dir) > 0:
+ data_files.append(( dp , files_in_dir))
# add thubaninit to the build
@@ -1071,7 +1071,7 @@
"warn_dir": 0,
"extra_files": ["COPYING", "Lib/proj.dll"],
}
- install_options["extra_files"].extend(self.get_gdal_content())
+ install_options["extra_files"].extend(self.get_gdal_content())
# don't make a symlink because we're simulating windows, so
# that we can generate the iss-file even on Linux
@@ -1083,12 +1083,12 @@
'''
Return the list of files in the gdal directory of the Thuban installation
'''
- gdal_files = []
- for (dirpath, dnames, fnames) in os.walk('gdal'):
- if len(fnames) > 0:
- for file in fnames :
- gdal_files.append(dirpath + os.sep + file)
- return gdal_files
+ gdal_files = []
+ for (dirpath, dnames, fnames) in os.walk('gdal'):
+ if len(fnames) > 0:
+ for file in fnames :
+ gdal_files.append(dirpath + os.sep + file)
+ return gdal_files
class thuban_build_docs(Command):
@@ -1180,8 +1180,8 @@
packages = ["Thuban", "Thuban.Lib", "Thuban.Model", "Thuban.UI",
"Extensions", "Extensions.gns2shp", "Extensions.wms",
"Extensions.importAPR", "Extensions.profiling",
- "Extensions.svgexport", "Extensions.mouseposition",
- "Extensions.bboxdump", "Extensions.ogr",
+ "Extensions.svgexport", "Extensions.mouseposition",
+ "Extensions.bboxdump", "Extensions.ogr",
"Extensions.umn_mapserver"],
ext_modules = extensions,
py_modules = py_modules,
Modified: trunk/thuban/test/test_save.py
===================================================================
--- trunk/thuban/test/test_save.py 2008-02-04 18:31:30 UTC (rev 2836)
+++ trunk/thuban/test/test_save.py 2008-02-13 22:31:31 UTC (rev 2837)
@@ -160,7 +160,7 @@
<classification>
<clnull label="">
<cldata fill="None" stroke="#000000"
- stroke_width="1"/>
+ stroke_width="1"/>
</clnull>
</classification>
</layer>
@@ -232,7 +232,7 @@
<classification>
<clnull label="">
<cldata fill="None" stroke="#000000"
- stroke_width="1"/>
+ stroke_width="1"/>
</clnull>
</classification>
</layer>
@@ -505,7 +505,7 @@
<classification>
<clnull label="">
<cldata fill="None" stroke="#000000"
- stroke_width="1"/>
+ stroke_width="1"/>
</clnull>
</classification>
</layer>
@@ -532,8 +532,8 @@
def _fetch_table_information(self):
# pretend that we've found a geometry column
self.geometry_column = "the_geom"
- # pretend this is a ARC shape type.
- self.shape_type = SHAPETYPE_ARC
+ # pretend this is a ARC shape type.
+ self.shape_type = SHAPETYPE_ARC
def IDColumn(self):
"""Return an object with a name attribute with value 'gid'"""
class dummycol:
@@ -576,7 +576,7 @@
<classification>
<clnull label="">
<cldata fill="None" stroke="#000000"
- stroke_width="1"/>
+ stroke_width="1"/>
</clnull>
</classification>
</layer>
More information about the Thuban-commits
mailing list