Revert "API Changes"

Author: cayetanobv

Test_utils.py

@@ -32,5 +32,5 @@ def icon():
 def qgisMinimumVersion():
     return "1.7"
 def classFactory(iface):
-    from pgRoutingLayer import pgRoutingLayer
-    return pgRoutingLayer(iface)
+    from pgRoutingLayer import PgRoutingLayer
+    return PgRoutingLayer(iface)

__init__.py

@@ -15,15 +15,11 @@
 System information functions:
 http://www.postgresql.org/docs/8.0/static/functions-info.html
 """
-from __future__ import print_function
-from builtins import str
-from builtins import map
-from qgis.core import QgsDataSourceUri
-from qgis.PyQt.QtCore import QSettings
-from qgis.PyQt.QtGui import QIcon
-from qgis.PyQt.QtWidgets import QInputDialog
 
+from PyQt4.QtCore import *
+from PyQt4.QtGui import *
 
+import qgis.core
 
 import psycopg2
 import psycopg2.extensions # for isolation levels
@@ -47,7 +43,7 @@ class TableConstraint(DbConn.TableConstraint):
 
 	def __init__(self, row):
 		self.name, con_type, self.is_defferable, self.is_deffered, keys = row[:5]
-		self.keys = list(map(int, keys.split(' ')))
+		self.keys = map(int, keys.split(' '))
 		self.con_type = TableConstraint.types[con_type]   # convert to enum
 		if self.con_type == TableConstraint.TypeCheck:
 			self.check_src = row[5]
@@ -62,7 +58,7 @@ def __init__(self, row):
 class TableIndex(DbConn.TableIndex):
 	def __init__(self, row):
 		self.name, columns = row
-		self.columns = list(map(int, columns.split(' ')))
+		self.columns = map(int, columns.split(' '))
 
 
 class TableTrigger(DbConn.TableTrigger):
@@ -78,12 +74,12 @@ def __init__(self, row):
 class DbError(DbConn.DbError):
 	def __init__(self, error, query=None):
 		# save error. funny that the variables are in utf8, not 
-		msg = str( error.args[0], 'utf-8')
+		msg = unicode( error.args[0], 'utf-8')
 		if query == None:
 			if hasattr(error, "cursor") and hasattr(error.cursor, "query"):
-				query = str(error.cursor.query, 'utf-8')
+				query = unicode(error.cursor.query, 'utf-8')
 		else:
-			query = str(query)
+			query = unicode(query)
 		DbConn.DbError.__init__(self, msg, query)
 
 
@@ -122,8 +118,8 @@ def connect(self, selected, parent=None):
 		if not settings.contains( "database" ): # non-existent entry?
 			raise DbError( 'there is no defined database connection "%s".' % selected )
 
-		get_value_str = lambda x: str(settings.value(x) if Utils.isSIPv2() else settings.value(x).toString())
-		service, host, port, database, username, password = list(map(get_value_str, ["service", "host", "port", "database", "username", "password"]))
+		get_value_str = lambda x: unicode(settings.value(x) if Utils.isSIPv2() else settings.value(x).toString())
+		service, host, port, database, username, password = map(get_value_str, ["service", "host", "port", "database", "username", "password"])
 
 		# qgis1.5 use 'savePassword' instead of 'save' setting
 		isSave = settings.value("save") if Utils.isSIPv2() else settings.value("save").toBool()
@@ -134,7 +130,7 @@ def connect(self, selected, parent=None):
 
 		settings.endGroup()
 
-		uri = qgis.core.QgsDataSourceUri()
+		uri = qgis.core.QgsDataSourceURI()
 		if service:
 			uri.setConnection(service, database, username, password)
 		else:
@@ -155,7 +151,7 @@ def __init__(self, uri):
 
 		try:
 			self.con = psycopg2.connect(self.con_info())
-		except psycopg2.OperationalError as e:
+		except psycopg2.OperationalError, e:
 			raise DbError(e)
 
 		if not self.dbname:
@@ -726,7 +722,7 @@ def sr_info_for_srid(self, srid):
 			if x is not None:
 				srtext = x.group()
 			return srtext
-		except DbError as e:
+		except DbError, e:
 			return "Unknown"
 
 	def insert_table_row(self, table, values, schema=None, cursor=None):
@@ -792,7 +788,7 @@ def get_named_cursor(self, table=None):
 	def _exec_sql(self, cursor, sql):
 		try:
 			cursor.execute(sql)
-		except psycopg2.Error as e:
+		except psycopg2.Error, e:
 			# do the rollback to avoid a "current transaction aborted, commands ignored" errors
 			self.con.rollback()
 			raise DbError(e)
@@ -808,12 +804,12 @@ def _exec_sql_and_commit(self, sql):
 		#	raise
 
 	def _quote(self, identifier):
-		identifier = str(identifier) # make sure it's python unicode string
+		identifier = unicode(identifier) # make sure it's python unicode string
 		return u'"%s"' % identifier.replace('"', '""')
 
 	def _quote_str(self, txt):
 		""" make the string safe - replace ' with '' """
-		txt = str(txt) # make sure it's python unicode string
+		txt = unicode(txt) # make sure it's python unicode string
 		return txt.replace("'", "''")
 
 	def _table_name(self, schema, table):
@@ -828,34 +824,25 @@ def _table_name(self, schema, table):
 
 	db = GeoDB(host='localhost',dbname='gis',user='gisak',passwd='g')
 
-	# fix_print_with_import
-	print(db.list_schemas())
-	# fix_print_with_import
-	print('==========')
+	print db.list_schemas()
+	print '=========='
 
 	for row in db.list_geotables():
-		# fix_print_with_import
-		print(row)
+		print row
 
-	# fix_print_with_import
-	print('==========')
+	print '=========='
 
 	for row in db.get_table_indexes('trencin'):
-		# fix_print_with_import
-		print(row)
+		print row
 
-	# fix_print_with_import
-	print('==========')
+	print '=========='
 
 	for row in db.get_table_constraints('trencin'):
-		# fix_print_with_import
-		print(row)
+		print row
 
-	# fix_print_with_import
-	print('==========')
+	print '=========='
 
-	# fix_print_with_import
-	print(db.get_table_rows('trencin'))
+	print db.get_table_rows('trencin')
 
 	#for fld in db.get_table_metadata('trencin'):
 	#	print fld