Merge pull request #16 from redapple/py3

Improve Python 3 compatibility

pyRdfa/__init__.py

@@ -449,7 +449,7 @@ def _get_input(self, name) :
 				return name
 		except HTTPError :
 			raise sys.exc_info()[1]
-		except RDFaError, e :
+		except RDFaError as e :
 			raise e
 		except :
 			(type, value, traceback) = sys.exc_info()
@@ -555,7 +555,7 @@ def copyErrors(tog, options) :
 				for k,ns in options.processor_graph.graph.namespaces() :
 					tog.bind(k,ns)
 					if pgraph != None : pgraph.bind(k,ns)
- 			options.reset_processor_graph()
+			options.reset_processor_graph()
 			return tog
 
 		# Separating this for a forward Python 3 compatibility
@@ -571,7 +571,7 @@ def copyErrors(tog, options) :
 			input = None
 			try :
 				input = self._get_input(name)
-			except FailedSource,ex :
+			except FailedSource as ex :
 				f = sys.exc_info()[1]
 				self.http_status = 400
 				if not rdfOutput : raise f
@@ -585,7 +585,7 @@ def copyErrors(tog, options) :
 				err = self.options.add_error("HTTP Error: %s (%s)" % (h.http_code,h.msg), HTError, name)
 				self.options.processor_graph.add_http_context(err, h.http_code)
 				return copyErrors(graph, self.options)
-			except RDFaError, ex:
+			except RDFaError as ex:
 				e = sys.exc_info()[1]
 				self.http_status = 500
 				# Something nasty happened:-(

pyRdfa/utils.py

@@ -40,7 +40,6 @@
 	from rdflib.RDF	import RDFNS  as ns_rdf
 
 from .host import HostLanguage, preferred_suffixes
-from types import *
 
 #########################################################################################################
 # Handling URIs
@@ -188,7 +187,7 @@ def has_one_of_attributes(node,*args) :
 	"""
 	if len(args) == 0 :
 		return None
-	if isinstance(args[0], TupleType) or isinstance(args[0],ListType) :
+	if isinstance(args[0], tuple) or isinstance(args[0], list) :
 		rargs = args[0]
 	else :
 		rargs = args