Skip to content

Commit 63cc02d

Browse files
NathanW2NathanW2
committedJun 3, 2013
Merge pull request #629 from volaya/sipapi
[sextante] updated to new sip api
·
ltr-3_40archive/master_2
2 parents 75cbdf6 + e46795a commit 63cc02d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+138
-195
lines changed
 

‎python/plugins/sextante/admintools/ImportIntoPostGIS.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ def processAlgorithm(self, progress):
5454
settings = QSettings()
5555
mySettings = "/PostgreSQL/connections/"+ connection
5656
try:
57-
database = settings.value(mySettings+"/database").toString()
58-
username = settings.value(mySettings+"/username").toString()
59-
host = settings.value(mySettings+"/host").toString()
60-
port = int(settings.value(mySettings+"/port").toString())
61-
password = settings.value(mySettings+"/password").toString()
57+
database = settings.value(mySettings+"/database")
58+
username = settings.value(mySettings+"/username")
59+
host = settings.value(mySettings+"/host")
60+
port = settings.value(mySettings+"/port", type = int)
61+
password = settings.value(mySettings+"/password")
6262
except Exception, e:
6363
raise GeoAlgorithmExecutionException("Wrong database connection name: " + connection)
6464

‎python/plugins/sextante/admintools/PostGISExecuteSQL.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ def processAlgorithm(self, progress):
4646
settings = QSettings()
4747
mySettings = "/PostgreSQL/connections/"+ connection
4848
try:
49-
database = settings.value(mySettings+"/database").toString()
50-
username = settings.value(mySettings+"/username").toString()
51-
host = settings.value(mySettings+"/host").toString()
52-
port = int(settings.value(mySettings+"/port").toString())
53-
password = settings.value(mySettings+"/password").toString()
49+
database = settings.value(mySettings+"/database")
50+
username = settings.value(mySettings+"/username")
51+
host = settings.value(mySettings+"/host")
52+
port = settings.value(mySettings+"/port", type = int)
53+
password = settings.value(mySettings+"/password")
5454
except Exception, e:
5555
raise GeoAlgorithmExecutionException("Wrong database connection name: " + connection)
5656
try:

0 commit comments

Comments
 (0)
Please sign in to comment.