Working python3 version

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/conf.py

@@ -52,8 +52,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'Nevow'
-copyright = u'2014, Twisted developers'
+project = 'Nevow'
+copyright = '2014, Twisted developers'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -205,8 +205,8 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-  ('index', 'Nevow.tex', u'Nevow Documentation',
-   u'Twisted developers', 'manual'),
+  ('index', 'Nevow.tex', 'Nevow Documentation',
+   'Twisted developers', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -235,8 +235,8 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'nevow', u'Nevow Documentation',
-     [u'Twisted developers'], 1)
+    ('index', 'nevow', 'Nevow Documentation',
+     ['Twisted developers'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -249,8 +249,8 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'Nevow', u'Nevow Documentation',
-   u'Twisted developers', 'Nevow', 'One line description of project.',
+  ('index', 'Nevow', 'Nevow Documentation',
+   'Twisted developers', 'Nevow', 'One line description of project.',
    'Miscellaneous'),
 ]
 

doc/howto/chattutorial/part00/listings/echothing/echobox.py

@@ -5,7 +5,7 @@
 class EchoElement(LiveElement):
 
     docFactory = xmlfile(sibpath(__file__, 'template.html'))
-    jsClass = u'EchoThing.EchoWidget'
+    jsClass = 'EchoThing.EchoWidget'
 
     def say(self, message):
         self.callRemote('addText', message)

doc/howto/chattutorial/part01/listings/chatthing/chatterbox.py

@@ -26,7 +26,7 @@ def makeChatter(self):
 class ChatterElement(LiveElement):
 
     docFactory = xmlfile(sibpath(__file__, 'template.html'))
-    jsClass = u'ChatThing.ChatterWidget'
+    jsClass = 'ChatThing.ChatterWidget'
 
     def __init__(self, room):
         self.room = room

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.html

@@ -23,6 +23,10 @@
 
         <table class="calculator" id="calculator" n:pattern="CalculatorPattern" n:render="liveElement"
                 xmlns:athena="http://divmod.org/ns/athena/0.7">
+                <div n:render="subcalc"> test </div>
+
+                <div class="subcalc" id="subcalc" n:pattern="subcalcPattern" n:render="liveElement" xmlns:athena="http://divmod.org/ns/athena/0.7"><athena:handler event="onclick" handler="subclicked" />hello world</div>
+
             <tr>
                 <td colspan="4" class="output" id="output">0</td>
             </tr>

examples/athenademo/calculator.js

@@ -6,6 +6,9 @@ CalculatorDemo.Calculator.methods(
     /**
      * Handle click events on any of the calculator buttons.
      */
+     function subclicked(self, node){
+         alert(10);
+     },
     function buttonClicked(self, node) {
         var symbol = node.value;
         d = self.callRemote("buttonClicked", symbol);

examples/athenademo/calculator.py

@@ -14,6 +14,7 @@
 from nevow.athena import LivePage, LiveElement, expose
 from nevow.loaders import xmlfile
 from nevow.appserver import NevowSite
+from nevow.page import renderer
 
 # Handy helper for finding external resources nearby.
 sibling = FilePath(__file__).sibling
@@ -28,8 +29,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 +58,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
@@ -69,6 +70,13 @@ def buttonClicked(self, symbol):
         return self.expression
 
 
+class SubCal(LiveElement):
+    docFactory = xmlfile(sibling('calculator.html').path, 'subcalcPattern')
+
+    jsClass = u"CalculatorDemo.Calculator"
+    def __init__(self, par):
+        self.setFragmentParent(par)
+
 
 class CalculatorElement(LiveElement):
     """
@@ -94,7 +102,10 @@ def __init__(self, calc):
         LiveElement.__init__(self)
         self.calc = calc
 
-
+    @renderer
+    def subcalc(self, *args):
+        return SubCal(self)
+
     def buttonClicked(self, symbol):
         """
         Accept a symbol from the browser, perform input validation on it,
@@ -123,7 +134,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
 
 
@@ -135,12 +146,13 @@ def render_calculator(self, ctx, data):
         c.setFragmentParent(self)
         return c
 
+
 
 
 def main():
     log.startLogging(sys.stdout)
     site = NevowSite(CalculatorParentPage(calc=Calculator()))
-    reactor.listenTCP(8080, site)
+    reactor.listenTCP(8081, site)
     reactor.run()
 
 

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,7 +73,7 @@ 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)

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()