Python3

docs/conf.py

@@ -40,8 +40,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'Quepy'
-copyright = u'2012, Machinalis'
+project = 'Quepy'
+copyright = '2012, Machinalis'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -183,8 +183,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'Quepy.tex', u'Quepy Documentation',
-   u'Machinalis', 'manual'),
+  ('index', 'Quepy.tex', 'Quepy Documentation',
+   'Machinalis', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -213,8 +213,8 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'quepy', u'Quepy Documentation',
-     [u'Machinalis'], 1)
+    ('index', 'quepy', 'Quepy Documentation',
+     ['Machinalis'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -227,8 +227,8 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'Quepy', u'Quepy Documentation',
-   u'Machinalis', 'Quepy', 'One line description of project.',
+  ('index', 'Quepy', 'Quepy Documentation',
+   'Machinalis', 'Quepy', 'One line description of project.',
    'Miscellaneous'),
 ]
 

examples/dbpedia/dbpedia/__init__.py

@@ -11,11 +11,11 @@
 DBpedia quepy.
 """
 
-from basic import *
-from music import *
-from movies import *
-from people import *
-from country import *
-from populated_place import *
-from tvshows import *
-from writers import *
+from .basic import *
+from .music import *
+from .movies import *
+from .people import *
+from .country import *
+from .populated_place import *
+from .tvshows import *
+from .writers import *

examples/dbpedia/dbpedia/basic.py

@@ -15,7 +15,7 @@
 from quepy.parsing import Lemma, Pos, QuestionTemplate, Token, Particle, \
                           Lemmas
 from quepy.dsl import HasKeyword, IsRelatedTo, HasType
-from dsl import DefinitionOf, LabelOf, IsPlace, \
+from .dsl import DefinitionOf, LabelOf, IsPlace, \
     UTCof, LocationOf
 
 

examples/dbpedia/dbpedia/country.py

@@ -14,7 +14,7 @@
 from refo import Plus, Question
 from quepy.dsl import HasKeyword
 from quepy.parsing import Lemma, Pos, QuestionTemplate, Token, Particle
-from dsl import IsCountry, IncumbentOf, CapitalOf, \
+from .dsl import IsCountry, IncumbentOf, CapitalOf, \
     LabelOf, LanguageOf, PopulationOf, PresidentOf
 
 

examples/dbpedia/dbpedia/movies.py

@@ -14,7 +14,7 @@
 from refo import Plus, Question
 from quepy.dsl import HasKeyword
 from quepy.parsing import Lemma, Lemmas, Pos, QuestionTemplate, Particle
-from dsl import IsMovie, NameOf, IsPerson, \
+from .dsl import IsMovie, NameOf, IsPerson, \
     DirectedBy, LabelOf, DurationOf, HasActor, HasName, ReleaseDateOf, \
     DirectorOf, StarsIn, DefinitionOf
 

examples/dbpedia/dbpedia/music.py

@@ -14,7 +14,7 @@
 from refo import Plus, Question
 from quepy.dsl import HasKeyword
 from quepy.parsing import Lemma, Lemmas, Pos, QuestionTemplate, Particle
-from dsl import IsBand, LabelOf, IsMemberOf, ActiveYears, MusicGenreOf, \
+from .dsl import IsBand, LabelOf, IsMemberOf, ActiveYears, MusicGenreOf, \
     NameOf, IsAlbum, ProducedBy
 
 

examples/dbpedia/dbpedia/people.py

@@ -14,7 +14,7 @@
 from refo import Plus, Question
 from quepy.dsl import HasKeyword
 from quepy.parsing import Lemma, Lemmas, Pos, QuestionTemplate, Particle
-from dsl import IsPerson, LabelOf, DefinitionOf, BirthDateOf, BirthPlaceOf
+from .dsl import IsPerson, LabelOf, DefinitionOf, BirthDateOf, BirthPlaceOf
 
 
 class Person(Particle):

examples/dbpedia/dbpedia/populated_place.py

@@ -14,7 +14,7 @@
 from refo import Plus, Question
 from quepy.dsl import HasKeyword
 from quepy.parsing import Lemma, Pos, QuestionTemplate, Token, Particle
-from dsl import IsPopulatedPlace, IncumbentOf, CapitalOf, \
+from .dsl import IsPopulatedPlace, IncumbentOf, CapitalOf, \
     LabelOf, PopulationOf
 
 

examples/dbpedia/dbpedia/settings.py

@@ -21,7 +21,7 @@
 DEFAULT_ENCODING = "utf-8"
 
 # Sparql config
-SPARQL_PREAMBLE = u"""
+SPARQL_PREAMBLE = """
 PREFIX owl: <http://www.w3.org/2002/07/owl#>
 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>

examples/dbpedia/dbpedia/tvshows.py

@@ -7,7 +7,7 @@
 from refo import Plus, Question
 from quepy.dsl import HasKeyword
 from quepy.parsing import Lemma, Lemmas, Pos, QuestionTemplate, Particle
-from dsl import IsTvShow, ReleaseDateOf, IsPerson, StarsIn, LabelOf, \
+from .dsl import IsTvShow, ReleaseDateOf, IsPerson, StarsIn, LabelOf, \
     HasShowName, NumberOfEpisodesIn, HasActor, ShowNameOf, CreatorOf
 
 nouns = Plus(Pos("NN") | Pos("NNS") | Pos("NNP") | Pos("NNPS"))

examples/dbpedia/dbpedia/writers.py

@@ -15,7 +15,7 @@
 from refo import Plus, Question
 from quepy.dsl import HasKeyword
 from quepy.parsing import Lemma, Lemmas, Pos, QuestionTemplate, Particle
-from dsl import IsBook, HasAuthor, AuthorOf, IsPerson, NameOf
+from .dsl import IsBook, HasAuthor, AuthorOf, IsPerson, NameOf
 
 
 nouns = Pos("DT") | Pos("IN") | Pos("NN") | Pos("NNS") | Pos("NNP") | Pos("NNPS")

examples/dbpedia/main.py

@@ -29,37 +29,37 @@
 def print_define(results, target, metadata=None):
     for result in results["results"]["bindings"]:
         if result[target]["xml:lang"] == "en":
-            print result[target]["value"]
-            print
+            print(result[target]["value"])
+            print()
 
 
 def print_enum(results, target, metadata=None):
     used_labels = []
 
     for result in results["results"]["bindings"]:
-        if result[target]["type"] == u"literal":
+        if result[target]["type"] == "literal":
             if result[target]["xml:lang"] == "en":
                 label = result[target]["value"]
                 if label not in used_labels:
                     used_labels.append(label)
-                    print label
+                    print(label)
 
 
 def print_literal(results, target, metadata=None):
     for result in results["results"]["bindings"]:
         literal = result[target]["value"]
         if metadata:
-            print metadata.format(literal)
+            print(metadata.format(literal))
         else:
-            print literal
+            print(literal)
 
 
 def print_time(results, target, metadata=None):
     gmt = time.mktime(time.gmtime())
     gmt = datetime.datetime.fromtimestamp(gmt)
 
     for result in results["results"]["bindings"]:
-        offset = result[target]["value"].replace(u"−", u"-")
+        offset = result[target]["value"].replace("−", "-")
 
         if ("to" in offset) or ("and" in offset):
             if "to" in offset:
@@ -83,19 +83,19 @@ def print_time(results, target, metadata=None):
             location_string = random.choice(["where you are",
                                              "your location"])
 
-            print "Between %s %s %s, depending on %s" % \
+            print("Between %s %s %s, depending on %s" % \
                   (from_time.strftime("%H:%M"),
                    connector,
                    to_time.strftime("%H:%M on %A"),
-                   location_string)
+                   location_string))
 
         else:
             offset = int(offset)
 
             delta = datetime.timedelta(hours=offset)
             the_time = gmt + delta
 
-            print the_time.strftime("%H:%M on %A")
+            print(the_time.strftime("%H:%M on %A"))
 
 
 def print_age(results, target, metadata=None):
@@ -110,7 +110,7 @@ def print_age(results, target, metadata=None):
     now = now.date()
 
     age = now - birth_date
-    print "{} years old".format(age.days / 365)
+    print("{} years old".format(age.days / 365))
 
 
 def wikipedia2dbpedia(wikipedia_url):
@@ -131,19 +131,21 @@ def wikipedia2dbpedia(wikipedia_url):
     results = sparql.query().convert()
 
     if not results["results"]["bindings"]:
-        print "Snorql URL not found"
+        print("Snorql URL not found")
         sys.exit(1)
     else:
         return results["results"]["bindings"][0]["url"]["value"]
 
 
 if __name__ == "__main__":
     default_questions = [
-        "What is a car?",
+        "谁是奥巴马？",]
+    """
+        "What is a car?",]
         "Who is Tom Cruise?",
         "Who is George Lucas?",
         "Who is Mirtha Legrand?",
-        # "List Microsoft software",
+        "List Microsoft software",
         "Name Fiat cars",
         "time in argentina",
         "what time is it in Chile?",
@@ -154,6 +156,7 @@ def wikipedia2dbpedia(wikipedia_url):
         "who directed Pocahontas?",
         "actors of Fight Club",
     ]
+    """
 
     if "-d" in sys.argv:
         quepy.set_loglevel("DEBUG")
@@ -163,7 +166,7 @@ def wikipedia2dbpedia(wikipedia_url):
         question = " ".join(sys.argv[1:])
 
         if question.count("wikipedia.org"):
-            print wikipedia2dbpedia(sys.argv[1])
+            print(wikipedia2dbpedia(sys.argv[1]))
             sys.exit(0)
         else:
             questions = [question]
@@ -179,8 +182,8 @@ def wikipedia2dbpedia(wikipedia_url):
     }
 
     for question in questions:
-        print question
-        print "-" * len(question)
+        print(question)
+        print("-" * len(question))
 
         target, query, metadata = dbpedia.get_query(question)
 
@@ -192,10 +195,10 @@ def wikipedia2dbpedia(wikipedia_url):
             metadata = None
 
         if query is None:
-            print "Query not generated :(\n"
+            print("Query not generated :(\n")
             continue
 
-        print query
+        print(query)
 
         if target.startswith("?"):
             target = target[1:]
@@ -205,8 +208,8 @@ def wikipedia2dbpedia(wikipedia_url):
             results = sparql.query().convert()
 
             if not results["results"]["bindings"]:
-                print "No answer found :("
+                print("No answer found :(")
                 continue
 
         print_handlers[query_type](results, target, metadata)
-        print
+        print()

examples/freebase/freebase/__init__.py

@@ -5,10 +5,10 @@
 Init for freebase quepy.
 """
 
-from basic import *
-from music import *
-from people import *
-from movies import *
-from country import *
-from tvshows import *
-from writers import *
+from .basic import *
+from .music import *
+from .people import *
+from .movies import *
+from .country import *
+from .tvshows import *
+from .writers import *

examples/freebase/freebase/basic.py

@@ -12,7 +12,7 @@
 """
 
 from refo import Question, Plus
-from dsl import DefinitionOf, NameOf, LocationOf
+from .dsl import DefinitionOf, NameOf, LocationOf
 from quepy.dsl import HasKeyword
 from quepy.parsing import QuestionTemplate, Particle, Lemma, Pos, Lemmas
 

examples/freebase/freebase/country.py

@@ -11,7 +11,7 @@
 Coutry related regex
 """
 
-from dsl import *
+from .dsl import *
 from refo import Plus, Question
 from quepy.dsl import HasKeyword
 from quepy.parsing import Lemma, Pos, QuestionTemplate, Token, Particle

examples/freebase/freebase/movies.py

@@ -14,7 +14,7 @@
 from refo import Plus, Question
 from quepy.dsl import HasKeyword
 from quepy.parsing import Lemma, Lemmas, Pos, QuestionTemplate, Particle
-from dsl import *
+from .dsl import *
 
 nouns = Plus(Pos("NN") | Pos("NNS") | Pos("NNP") | Pos("NNPS"))
 

examples/freebase/freebase/music.py

@@ -11,7 +11,7 @@
 Music related regex
 """
 
-from dsl import *
+from .dsl import *
 from refo import Plus, Question
 from quepy.dsl import HasKeyword
 from quepy.parsing import Lemma, Lemmas, Pos, QuestionTemplate, Particle

examples/freebase/freebase/people.py

@@ -11,7 +11,7 @@
 People related regex
 """
 
-from dsl import *
+from .dsl import *
 from refo import Plus, Question
 from quepy.dsl import HasKeyword
 from quepy.parsing import Lemma, Lemmas, Pos, QuestionTemplate, Particle

examples/freebase/freebase/tvshows.py

@@ -4,7 +4,7 @@
 Tv Shows related regex.
 """
 
-from dsl import *
+from .dsl import *
 from refo import Plus, Question
 from quepy.dsl import HasKeyword
 from quepy.parsing import Lemma, Lemmas, Pos, QuestionTemplate, Particle

examples/freebase/freebase/writers.py

@@ -12,7 +12,7 @@
 """
 
 
-from dsl import *
+from .dsl import *
 from refo import Plus, Question
 from quepy.dsl import HasKeyword
 from quepy.parsing import Lemma, Lemmas, Pos, QuestionTemplate, Particle