From 4b614b9b35cd2baddb7ca67c04bee5d70ec6a172 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sat, 27 Apr 2013 19:53:57 -0400 Subject: - the raw 2to3 run - went through examples/ and cleaned out excess list() calls --- examples/inheritance/concrete.py | 2 +- examples/inheritance/joined.py | 14 +++++++------- examples/inheritance/single.py | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'examples/inheritance') diff --git a/examples/inheritance/concrete.py b/examples/inheritance/concrete.py index 75741df6d..b05afa5ea 100644 --- a/examples/inheritance/concrete.py +++ b/examples/inheritance/concrete.py @@ -68,5 +68,5 @@ session.add(e1) session.add(e2) session.commit() -print session.query(Employee).all() +print(session.query(Employee).all()) diff --git a/examples/inheritance/joined.py b/examples/inheritance/joined.py index 4d3dc08d0..c6ce37146 100644 --- a/examples/inheritance/joined.py +++ b/examples/inheritance/joined.py @@ -92,10 +92,10 @@ session.commit() c = session.query(Company).get(1) for e in c.employees: - print e, inspect(e).key, e.company + print(e, inspect(e).key, e.company) assert set([e.name for e in c.employees]) == set(['pointy haired boss', 'dilbert', 'joesmith', 'wally', 'jsmith']) -print "\n" +print("\n") dilbert = session.query(Person).filter_by(name='dilbert').one() dilbert2 = session.query(Engineer).filter_by(name='dilbert').one() @@ -107,29 +107,29 @@ session.commit() c = session.query(Company).get(1) for e in c.employees: - print e + print(e) # query using with_polymorphic. eng_manager = with_polymorphic(Person, [Engineer, Manager], aliased=True) -print session.query(eng_manager).\ +print(session.query(eng_manager).\ filter( or_(eng_manager.Engineer.engineer_name=='engineer1', eng_manager.Manager.manager_name=='manager2' ) - ).all() + ).all()) # illustrate join from Company, # We use aliased=True # to help when the selectable is used as the target of a join. eng_manager = with_polymorphic(Person, [Engineer, Manager], aliased=True) -print session.query(Company).\ +print(session.query(Company).\ join( eng_manager, Company.employees ).filter( or_(eng_manager.Engineer.engineer_name=='engineer1', eng_manager.Manager.manager_name=='manager2') - ).all() + ).all()) session.commit() diff --git a/examples/inheritance/single.py b/examples/inheritance/single.py index b2f934120..b445f74a6 100644 --- a/examples/inheritance/single.py +++ b/examples/inheritance/single.py @@ -23,7 +23,7 @@ employees_table = Table('employees', metadata, class Person(object): def __init__(self, **kwargs): - for key, value in kwargs.iteritems(): + for key, value in kwargs.items(): setattr(self, key, value) def __repr__(self): return "Ordinary person %s" % self.name @@ -39,7 +39,7 @@ class Manager(Person): (self.name, self.status, self.manager_name) class Company(object): def __init__(self, **kwargs): - for key, value in kwargs.iteritems(): + for key, value in kwargs.items(): setattr(self, key, value) def __repr__(self): return "Company %s" % self.name @@ -79,9 +79,9 @@ session.commit() c = session.query(Company).get(1) for e in c.employees: - print e, e.company + print(e, e.company) -print "\n" +print("\n") dilbert = session.query(Person).filter_by(name='dilbert').one() dilbert2 = session.query(Engineer).filter_by(name='dilbert').one() @@ -94,7 +94,7 @@ session.expunge_all() c = session.query(Company).get(1) for e in c.employees: - print e + print(e) session.delete(c) session.commit() -- cgit v1.2.1