py3 fixalltests

.gitignore

@@ -0,0 +1,5 @@
+build
+dist
+*dropin.cache
+*egg-info
+*_temp

NEWS.rst

@@ -1,3 +1,19 @@
+Nevow 1.0 (2018-02-01)
+======================
+
+Features
+--------
+
+This release is compatible with python3, and actually incompatible with
+python2.
+
+- _flat.flatten no longer worries about encoding strings; this has
+  to be done by the write function passed.
+- htmlfile and htmlstr are now aliases for xmlfile and xmlstr and 
+  consequently require well-formed XML.  This change results from the
+  microdom being effecively dropped from twisted.web for python3
+
+
 Nevow 0.14.3 (2017-07-26)
 =========================
 

benchmarks/json_string_tokenizer.py

@@ -22,7 +22,7 @@ def postOptions(self):
         self['scale'] = int(self['scale'])
 
 
-BASE = u'Hello, world.  "Quotes".'
+BASE = 'Hello, world.  "Quotes".'
 def benchmark(iterations, scale):
     """
     Deserialize a string C{iterations} times.  Make the string longer based
@@ -32,10 +32,10 @@ def benchmark(iterations, scale):
     """
     s = serialize(BASE * scale)
     before = time()
-    for i in xrange(iterations):
+    for i in range(iterations):
         parse(s)
     after = time()
-    print (after - before) / iterations, 'per call'
+    print((after - before) / iterations, 'per call')
 
 
 

doc/strings_and_bytes.rst

@@ -0,0 +1,62 @@
+=====================================
+Strings vs. Bytes in Nevow on python3
+=====================================
+
+Twisted.web decided to have represent several items in their Request
+class – which is used quite frequently in nevow and exposed to user code
+– as bytes.  Also, at some point nevow has to produce bytes, as that is
+what needs to go down the line.
+
+In between, however, I'd like to keep out bytes as much as possible and
+let people work with strings as far as possible.  This document attempts
+to delineate the string/bytes perimeter.
+
+Given that, unfortunately, that perimeter is long and twisted, the plan
+is to accept bytes and strings in several places (in particular, always
+for URIs), where bytes, for these purposes, are supposed to be in a
+(perhaps at some poin configurable) default encoding, which for now is
+utf-8 independent of the enviroment.
+
+Use utils.toBytes or utils.toString to turn function arguments into
+strings or bytes as requrired.
+
+
+Bytes within Twisted we're concerned with
+=========================================
+
+The most important items that are byte strings within request, include:
+
+* uri
+* keys and values in args (this hurts a lot)
+* header keys (but header values are decoded)
+* prePath -- this is where segments come from; segments, however, are
+  nevow interface and hence strings.
+* the arguments to write (in nevow, we accept strings, too)
+
+
+At least cred.checkers.InMemoryUsernamePasswordDatabaseDontUse
+explicitly ASCII-encodes their usernames right now.  Since that's
+what's used in the unit tests, I'm following ASCII-encoded usernames
+in guard.  This seems insane.  Anyone actually working with guard
+should look into this.
+
+
+Bytes usage within nevow itself
+===============================
+
+While flatteners still return strings, what is passed on to
+twisted.web requests' write methods must, of course, be bytes.
+nevow.appserver.Requests make that translation using utils.toBytes; user
+code requiring non-UTF-8 encodings needs to translate to bytes itself at
+this point.
+
+Since renderHTTP can (and is, indeed, encouraged to) write strings and
+the translation is done within nevow.Request.write (or similar),
+Page.renderSynchronously and Page.renderString return strings rather
+than bytes.
+
+This is particularly relevant for unit tests: what is in the
+FakeRequest's accumulator is bytes.
+
+
+.. vim:tw=72

examples/advanced_manualform/advanced_manualform.py

@@ -61,7 +61,7 @@ def redirectAfterPost(aspects):
             magicCookie = str(now())
             refpath = refpath.replace('_nevow_carryover_', magicCookie)
             _CARRYOVER[magicCookie] = C = tpc.Componentized()
-            for k, v in aspects.iteritems():
+            for k, v in aspects.items():
                 C.setComponent(k, v)
             request.redirect(str(refpath))
             from nevow import static
@@ -99,8 +99,8 @@ class Page(ManualFormMixin, rend.Page):
     def form_post_btn1(self, what=None):
         # 'what' is a keyword argument, and must be the same name that you
         # give to the widget.
-        print "btn1:", what
+        print("btn1:", what)
 
     def form_post_btn2(self, what=None):
         # see above for 'what'.
-        print "btn2:", what
+        print("btn2:", what)

examples/athenademo/benchmark.py

@@ -1,5 +1,5 @@
 
-from __future__ import division
+
 
 from twisted.python import filepath
 
@@ -31,7 +31,7 @@ def render_body(self, ctx, data):
             yield top
 
 class InitializationBenchmark(athena.LiveFragment):
-    jsClass = u'Nevow.Benchmarks.InitializationBenchmark'
+    jsClass = 'Nevow.Benchmarks.InitializationBenchmark'
 
     docFactory = loaders.stan(
         tags.div(render=tags.directive('liveFragment'))[

examples/athenademo/calculator.py

@@ -28,8 +28,8 @@ class Calculator(object):
         entered into the calculator.  For example, if the buttons '3', '5', and
         '+' have been pressed (in that order), C{expression} will be C{'35+'}.
     """
-    defaultExpression = u'0'
-    errorExpression = u'E'
+    defaultExpression = '0'
+    errorExpression = 'E'
 
     def __init__(self):
         self.expression = self.defaultExpression
@@ -57,7 +57,7 @@ def buttonClicked(self, symbol):
         # Evaluate the expression
         if symbol == '=':
             try:
-                self.expression = unicode(eval(self.expression))
+                self.expression = str(eval(self.expression))
             except ZeroDivisionError:
                 self.expression = self.errorExpression
             return self.expression
@@ -86,7 +86,7 @@ class CalculatorElement(LiveElement):
     """
     docFactory = xmlfile(sibling('calculator.html').path, 'CalculatorPattern')
 
-    jsClass = u"CalculatorDemo.Calculator"
+    jsClass = "CalculatorDemo.Calculator"
 
     validSymbols = '0123456789/*-=+.C'
 
@@ -123,7 +123,7 @@ def __init__(self, *a, **kw):
         # Update the mapping of known JavaScript modules so that the
         # client-side code for this example can be found and served to the
         # browser.
-        self.jsModules.mapping[u'CalculatorDemo'] = sibling(
+        self.jsModules.mapping['CalculatorDemo'] = sibling(
             'calculator.js').path
 
 

examples/athenademo/typeahead.py

@@ -3,10 +3,10 @@
 from formless import annotate, webform
 from twisted.python import util
 
-animals = {u'elf' : u'Pointy ears.  Bad attitude regarding trees.',
-           u'chipmunk': u'Cute.  Fuzzy.  Sings horribly.',
-           u'chupacabra': u'It sucks goats.',
-           u'ninja': u'Stealthy and invisible, and technically an animal.',
+animals = {'elf' : 'Pointy ears.  Bad attitude regarding trees.',
+           'chipmunk': 'Cute.  Fuzzy.  Sings horribly.',
+           'chupacabra': 'It sucks goats.',
+           'ninja': 'Stealthy and invisible, and technically an animal.',
            }
 
 
@@ -26,18 +26,18 @@ class TypeAheadFieldFragment(athena.LiveFragment):
                 ])
 
     def loadDescription(self, typed):
-        if typed == u'':
-            return None, u'--'
+        if typed == '':
+            return None, '--'
         matches = []
         for key in animals:
             if key.startswith(typed):
                  matches.append(key)
         if len(matches) == 1:
             return matches[0], animals[matches[0]]
         elif len(matches) > 1:
-            return None, u"(Multiple found)"
+            return None, "(Multiple found)"
         else:
-            return None, u'--'
+            return None, '--'
     athena.expose(loadDescription)
 
 class DataEntry(rend.Page):
@@ -75,7 +75,7 @@ def animals(self, animal, description):
         return url.here
 
     def data_animals(self, ctx, data):
-        return animals.keys()
+        return list(animals.keys())
 
     def child_typeahead(self, ctx):
         return TypeAheadPage(None, None)

examples/athenademo/widgets.py

@@ -7,7 +7,7 @@
 from nevow import athena, loaders, static
 
 class Clock(athena.LiveFragment):
-    jsClass = u"WidgetDemo.Clock"
+    jsClass = "WidgetDemo.Clock"
 
     docFactory = loaders.xmlstr('''\
 <div xmlns:nevow="http://nevow.com/ns/nevow/0.1"
@@ -49,7 +49,7 @@ def _oops(self, err):
             self.running = False
 
     def updateTime(self):
-        self.callRemote('setTime', unicode(time.ctime(), 'ascii')).addErrback(self._oops)
+        self.callRemote('setTime', str(time.ctime(), 'ascii')).addErrback(self._oops)
 
 class WidgetPage(athena.LivePage):
     docFactory = loaders.xmlstr("""\
@@ -73,14 +73,15 @@ class WidgetPage(athena.LivePage):
 
     def __init__(self, *a, **kw):
         super(WidgetPage, self).__init__(*a, **kw)
-        self.jsModules.mapping[u'WidgetDemo'] = util.sibpath(__file__, 'widgets.js')
+        self.jsModules.mapping['WidgetDemo'] = util.sibpath(__file__, 'widgets.js')
 
     def childFactory(self, ctx, name):
         ch = super(WidgetPage, self).childFactory(ctx, name)
         if ch is None:
             p = util.sibpath(__file__, name)
             if os.path.exists(p):
-                ch = static.File(file(p))
+                with open(p) as f:
+                    ch = static.File(f)
         return ch
 
     def render_clock(self, ctx, data):

examples/blogengine/axiomstore.py

@@ -1,5 +1,5 @@
 from iblogengine import IBlog
-from zope.interface import implements
+from zope.interface import implementer
 from axiom import item, store, attributes, sequence
 from epsilon.extime import Time
 
@@ -24,8 +24,8 @@ def __init__(self, **kw):
     def setModified(self):
         self.modified = Time()
 
+@implementer(IBlog)
 class Blog(item.Item, item.InstallableMixin):
-    implements(IBlog)
 
     typeName = "BlogengineBlog"
     schemaVersion = 1
@@ -38,10 +38,10 @@ def __init__(self, **kw):
         self.posts = sequence.List(store=self.store)
         post = Post(store=self.store,
                     id=self.getNextId(),
-                    author=u'mike',
-                    title=u'FIRST POST!!!!',
-                    category=u'Test',
-                    content=u'I guess it worked.')
+                    author='mike',
+                    title='FIRST POST!!!!',
+                    category='Test',
+                    content='I guess it worked.')
         self.addNewPost(post)
 
     def installOn(self, other):

examples/blogengine/email_client.py

@@ -1,8 +1,8 @@
 import sys, smtplib
 
-fromaddr = raw_input("From: ")
-toaddrs  = raw_input("To: ").split(',')
-print "Enter message, end with ^D:"
+fromaddr = input("From: ")
+toaddrs  = input("To: ").split(',')
+print("Enter message, end with ^D:")
 msg = ''
 while 1:
     line = sys.stdin.readline()

examples/blogengine/frontend.py

@@ -1,5 +1,5 @@
 from time import time as now
-from zope.interface import implements, Interface
+from zope.interface import implementer, Interface
 
 from twisted.web import xmlrpc
 from twisted.python.components import registerAdapter
@@ -49,9 +49,9 @@ def locateChild(self, ctx, segments):
 class UI(BaseUI):
 
     docFactory = loaders.xmlfile ('ui.html')
-    child_styles = static.File('styles')
+    child_styles = static.File('styles')
     child_images = static.File('images')
-    child_webform_css = webform.defaultCSS
+    child_webform_css = webform.defaultCSS
 
     def render_starttimer(self, ctx, data):
         ctx.remember(now(), ITimer)
@@ -109,8 +109,8 @@ def child_thx(self, ctx):
         return Thx()
 
 ##################################
+@implementer(IInsert)
 class NewEntry(BaseUI):
-    implements(IInsert)
 
     docFactory = loaders.stan(
         t.html[
@@ -132,10 +132,10 @@ def render_forms(self, ctx, data):
     def insert(self, ctx, id, title, author, category, content):
         newPost = Post(store=IStore(ctx),
                        id=int(id),
-                       author=unicode(author),
-                       title=unicode(title),
-                       category=unicode(category),
-                       content=unicode(content))
+                       author=str(author),
+                       title=str(title),
+                       category=str(category),
+                       content=str(content))
         IBlog(IStore(ctx)).addNewPost(newPost)
         inevow.IRequest(ctx).setComponent(iformless.IRedirectAfterPost, '/thx')
 
@@ -150,8 +150,8 @@ class Thx(rend.Page):
             ])
 
 ####################################
+@implementer(IInsert)
 class Entry(UI):
-    implements(IInsert)
     def data_getEntries(self, ctx, data):
         return [data]
 
@@ -165,10 +165,10 @@ def render_forms(self, ctx, data):
         return webform.renderForms()
 
     def insert(self, ctx, id, title, author, category, content):
-        self.original.author = unicode(author)
-        self.original.title = unicode(title)
-        self.original.category = unicode(category)
-        self.original.content = unicode(content)
+        self.original.author = str(author)
+        self.original.title = str(title)
+        self.original.category = str(category)
+        self.original.content = str(content)
         inevow.IRequest(ctx).setComponent(iformless.IRedirectAfterPost, '/thx')
 
 #####################################
@@ -213,10 +213,10 @@ def xmlrpc_publish(self, author, title, category, content):
         newid = IBlog(self.store).getNextId()
         newPost = Post(store=self.store,
                        id=newid,
-                       author=unicode(author),
-                       title=unicode(title),
-                       category=unicode(category),
-                       content=unicode(content))
+                       author=str(author),
+                       title=str(title),
+                       category=str(category),
+                       content=str(content))
         IBlog(self.store).addNewPost(newPost)
         return 'Successfully added post number %s' % newid
     xmlrpc_publish = transacted(xmlrpc_publish)