Merge lp:~cjwatson/storm/py3-doctest into lp:storm

[Colin Watson]

Adjust doctests for text repr changes in Python 3.

None of these doctests need to care about the fine details of str vs. Unicode in Python 2 (that sort of thing is tested more specifically in unit tests), and in Python 3 the repr of a text string is '...' rather than u'...'. Rearrange the doctests to tolerate this.

[Kristian Glass (doismellburning)]

review: Approve

=== modified file 'tests/infoheritance.txt'
--- tests/infoheritance.txt	2009-02-04 02:00:02 +0000
+++ tests/infoheritance.txt	2019-08-11 10:01:42 +0000
@@ -224,12 +224,16 @@
 ...     return result
 
 >>> secret_agent = get_persons(store, info_classes=[SecretAgent]).one()
->>> secret_agent.name, secret_agent.info.passcode
-(u'Dick Tracy', u'secret!')
+>>> print(secret_agent.name)
+Dick Tracy
+>>> print(secret_agent.info.passcode)
+secret!
 
 >>> teacher = get_persons(store, info_classes=[Teacher]).one()
->>> teacher.name, teacher.info.school
-(u'Mrs. Cohen', u'Cameron Elementary School')
+>>> print(teacher.name)
+Mrs. Cohen
+>>> print(teacher.info.school)
+Cameron Elementary School
 
 >>>
 }}}
@@ -260,8 +264,10 @@
 >>> store.rollback()
 
 >>> ghost = get_persons(store, info_classes=[Ghost]).one()
->>> ghost.name, ghost.info.friendly
-(u'Casper', True)
+>>> print(ghost.name)
+Casper
+>>> print(ghost.info.friendly)
+True
 
 >>>
 }}}

=== modified file 'tests/tutorial.txt'
--- tests/tutorial.txt	2019-06-05 11:41:07 +0000
+++ tests/tutorial.txt	2019-08-11 10:01:42 +0000
@@ -73,8 +73,10 @@
 >>> joe = Person()
 >>> joe.name = u"Joe Johnes"
 
->>> print("%r, %r" % (joe.id, joe.name))
-None, u'Joe Johnes'
+>>> print(joe.id)
+None
+>>> print(joe.name)
+Joe Johnes
 
 }}}
 
@@ -85,8 +87,10 @@
 >>> store.add(joe)
 <...Person object at 0x...>
 
->>> print("%r, %r" % (joe.id, joe.name))
-None, u'Joe Johnes'
+>>> print(joe.id)
+None
+>>> print(joe.name)
+Joe Johnes
 
 }}}
 
@@ -116,8 +120,10 @@
 {{{#!python
 >>> person = store.find(Person, Person.name == u"Joe Johnes").one()
 
->>> print("%r, %r" % (person.id, person.name))
-1, u'Joe Johnes'
+>>> print(person.id)
+1
+>>> print(person.name)
+Joe Johnes
 
 >>>
 }}}
@@ -127,8 +133,8 @@
 We can also retrieve the object using its primary key.
 
 {{{#!python
->>> store.get(Person, 1).name
-u'Joe Johnes'
+>>> print(store.get(Person, 1).name)
+Joe Johnes
 
 }}}
 
@@ -168,12 +174,16 @@
 >>> store.add(mary)
 <...Person object at 0x...>
 
->>> print("%r, %r" % (mary.id, mary.name))
-None, u'Mary Margaret'
+>>> print(mary.id)
+None
+>>> print(mary.name)
+Mary Margaret
 
 >>> store.flush()
->>> print("%r, %r" % (mary.id, mary.name))
-2, u'Mary Margaret'
+>>> print(mary.id)
+2
+>>> print(mary.name)
+Mary Margaret
 
 }}}
 
@@ -184,8 +194,8 @@
 
 {{{#!python
 >>> store.find(Person, Person.name == u"Mary Margaret").set(name=u"Mary Maggie")
->>> mary.name
-u'Mary Maggie'
+>>> print(mary.name)
+Mary Maggie
 
 }}}
 
@@ -240,8 +250,10 @@
 Actually, something happened.. with Joe.  He's back!
 
 {{{#!python
->>> print("%r, %r" % (joe.id, joe.name))
-1, u'Joe Johnes'
+>>> print(joe.id)
+1
+>>> print(joe.name)
+Joe Johnes
 
 }}}
 
@@ -279,8 +291,10 @@
 {{{
 >>> circus = Company(u"Circus Inc.")
 
->>> print("%r, %r" % (circus.id, circus.name))
-None, u'Circus Inc.'
+>>> print(circus.id)
+None
+>>> print(circus.name)
+Circus Inc.
 
 }}}
 
@@ -327,8 +341,12 @@
 {{{#!python
 >>> ben = store.add(Employee(u"Ben Bill"))
 
->>> print("%r, %r, %r" % (ben.id, ben.name, ben.company_id))
-None, u'Ben Bill', None
+>>> print(ben.id)
+None
+>>> print(ben.name)
+Ben Bill
+>>> print(ben.company_id)
+None
 
 }}}
 
@@ -338,8 +356,10 @@
 {{{#!python
 >>> ben.company = circus
 
->>> print("%r, %r" % (ben.company_id, ben.company.name))
-None, u'Circus Inc.'
+>>> print(ben.company_id)
+None
+>>> print(ben.company.name)
+Circus Inc.
 
 }}}
 
@@ -354,8 +374,10 @@
 {{{#!python
 >>> store.flush()
 
->>> print("%r, %r" % (ben.company_id, ben.company.name))
-1, u'Circus Inc.'
+>>> print(ben.company_id)
+1
+>>> print(ben.company.name)
+Circus Inc.
 
 }}}
 
@@ -381,8 +403,8 @@
 
 {{{#!python
 >>> ben.company_id = 2
->>> ben.company.name
-u'Sweets Inc.'
+>>> print(ben.company.name)
+Sweets Inc.
 >>> ben.company is sweets
 True
 
@@ -419,10 +441,12 @@
 1
 
 >>> for employee in sweets.employees:
-...     print("%r, %r" % (employee.id, employee.name))
+...     print(employee.id)
+...     print(employee.name)
 ...     print(employee is ben)
 ...
-1, u'Ben Bill'
+1
+Ben Bill
 True
 
 }}}
@@ -555,11 +579,14 @@
 ...                                     CompanyAccountant.company_id,
 ...                                     Company.id)
 
->>> sorted([company.name for company in frank.companies])
-[u'Circus Inc.', u'Sweets Inc.']
+>>> for name in sorted(company.name for company in frank.companies):
+...     print(name)
+Circus Inc.
+Sweets Inc.
 
->>> [company.name for company in karl.companies]
-[u'Sweets Inc.']
+>>> for company in karl.companies:
+...     print(company.name)
+Sweets Inc.
 
 }}}
 
@@ -580,8 +607,9 @@
 ...                     Employee.name.like(u"Ben %"))
 ...
 
->>> [company.name for company in result]
-[u'Sweets Inc.']
+>>> for company in result:
+...     print(company.name)
+Sweets Inc.
 
 }}}
 
@@ -592,8 +620,9 @@
 >>> origin = [Company, Join(Employee, Employee.company_id == Company.id)]
 >>> result = store.using(*origin).find(Company, Employee.name.like(u"Ben %"))
 
->>> [company.name for company in result]
-[u'Sweets Inc.']
+>>> for company in result:
+...     print(company.name)
+Sweets Inc.
 
 }}}
 
@@ -604,8 +633,9 @@
 {{{#!python
 >>> result = sweets.employees.find(Employee.name.like(u"Ben %"))
 
->>> [employee.name for employee in result]
-[u'Ben Bill']
+>>> for employee in result:
+...     print(employee.name)
+Ben Bill
 
 }}}
 
@@ -642,14 +672,22 @@
 
 >>> result = store.find(Employee)
 
->>> [employee.name for employee in result.order_by(Employee.name)]
-[u'Ben Bill', u'Garry Glare', u'Mike Mayer']
-
->>> [employee.name for employee in result.order_by(Desc(Employee.name))]
-[u'Mike Mayer', u'Garry Glare', u'Ben Bill']
-
->>> [employee.name for employee in result.order_by(Employee.name)[:2]]
-[u'Ben Bill', u'Garry Glare']
+>>> for employee in result.order_by(Employee.name):
+...     print(employee.name)
+Ben Bill
+Garry Glare
+Mike Mayer
+
+>>> for employee in result.order_by(Desc(Employee.name)):
+...     print(employee.name)
+Mike Mayer
+Garry Glare
+Ben Bill
+
+>>> for employee in result.order_by(Employee.name)[:2]:
+...     print(employee.name)
+Ben Bill
+Garry Glare
 
 }}}
 
@@ -666,8 +704,11 @@
 ...                     Employee.company_id == Company.id,
 ...                     Employee.name.like(u"Ben %"))
 
->>> [(company.name, employee.name) for company, employee in result]
-[(u'Sweets Inc.', u'Ben Bill')]
+>>> for company, employee in result:
+...     print(company.name)
+...     print(employee.name)
+Sweets Inc.
+Ben Bill
 
 }}}
 
@@ -722,8 +763,8 @@
 >>> brazil.name = u"Brazil"
 >>> brazil.currency_id = 1
 
->>> brazil.currency.symbol
-u'BRL'
+>>> print(brazil.currency.symbol)
+BRL
 
 }}}
 
@@ -781,8 +822,9 @@
 
 {{{#!python
 >>> result = store.execute(Select(Person.name, Person.id == 1))
->>> result.get_one()
-(u'Joe Johnes',)
+>>> (name,) = result.get_one()
+>>> print(name)
+Joe Johnes
 
 }}}
 
@@ -829,8 +871,8 @@
 from storm.locals import SQL
 
 >>> ruy.name = SQL("(SELECT name || ? FROM person WHERE id=4)", (" Ritcher",))
->>> ruy.name
-u'Ruy Ritcher'
+>>> print(ruy.name)
+Ruy Ritcher
 
 }}}
 
@@ -865,8 +907,10 @@
 ...                     Employee.id > AnotherEmployee.id)
 
 >>> for employee1, employee2 in result:
-...     print((employee1.name, employee2.name))
-(u'Mike Mayer', u'Ben Bill')
+...     print(employee1.name)
+...     print(employee2.name)
+Mike Mayer
+Ben Bill
 
 }}}
 
@@ -895,7 +939,7 @@
 ...                     Employee.company_id == AnotherEmployee.company_id,
 ...                     Employee.id > AnotherEmployee.id)
 >>> list(result)
-[...] EXECUTE: u'SELECT employee.company_id, employee.id, employee.name, "...".company_id, "...".id, "...".name FROM employee, employee AS "..." WHERE employee.company_id = "...".company_id AND employee.id > "...".id', ()
+[...] EXECUTE: ...'SELECT employee.company_id, employee.id, employee.name, "...".company_id, "...".id, "...".name FROM employee, employee AS "..." WHERE employee.company_id = "...".company_id AND employee.id > "...".id', ()
 [...] DONE
 [(<...Employee object at ...>, <...Employee object at ...>)]
 

=== modified file 'tests/zope/README.txt'
--- tests/zope/README.txt	2011-10-28 16:15:01 +0000
+++ tests/zope/README.txt	2019-08-11 10:01:42 +0000
@@ -139,16 +139,19 @@
 
 At this point a store.find should return the new object.
 
-  >>> sorted([person.name for person in store.find(Person)])
-  [u'Imposter!', u'John Doe']
+  >>> for name in sorted(person.name for person in store.find(Person)):
+  ...     print(name)
+  Imposter!
+  John Doe
 
 All this means is that the data has been flushed to the database; it's
 still not committed.  If we abort the transaction the new Person
 object should disappear.
 
   >>> transaction.abort()
-  >>> [person.name for person in store.find(Person)]
-  [u'John Doe']
+  >>> for person in store.find(Person):
+  ...     print(person.name)
+  John Doe
 
 Excellent!  As you can see, ZStorm makes working with SQL databases
 and Zope 3 very natural.