Add tag

nevow/formless/configurable.py

@@ -106,7 +106,7 @@ class Configurable(object):
             ## This won't work right now. We need to push the previous configurable
             ## as the configurableFactory somehow and ask that for hte next binding
             ## we also need to support deferreds coming back from locateConfigurable
-            assert 'black' is 'white', "Deferred support is pending"
+            assert 'black' == 'white', "Deferred support is pending"
             configurable = cf.locateConfigurable(ctx, child)
             ctx = WovenContext(ctx, invisible(key=seg))
             ctx.remember(binding, IBinding)

nevow/nevow/__init__.py

@@ -48,6 +48,7 @@ def _versions():
     dev = parts.group('dev')
     if dev:
         dev = int(dev.replace('dev', ''))
+    print(__version_info__)
     try:
         version = Version(
             "nevow",
@@ -269,3 +270,7 @@ __all__ = [
     'accessors', 'appserver', 'blocks', 'canvas', 'context', 'dirlist', 'entities', 'events', 'failure', 'guard', 'inevow',
     'loaders', 'rend', 'scripts', 'stan', 'static', 'tags', 'test', 'testutil', 'url', 'util', 'vhost', 'flat', 'version',
 ]
+
+from ._version import get_versions
+__version__ = get_versions()['version']
+del get_versions

nevow/nevow/_version.py

@@ -86,20 +86,20 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False,
             if e.errno == errno.ENOENT:
                 continue
             if verbose:
-                print(("unable to run %s" % dispcmd))
+                print("unable to run %s" % dispcmd)
                 print(e)
             return None, None
     else:
         if verbose:
-            print(("unable to find command, tried %s" % (commands,)))
+            print("unable to find command, tried %s" % (commands,))
         return None, None
     stdout = p.communicate()[0].strip()
     if sys.version_info[0] >= 3:
         stdout = stdout.decode()
     if p.returncode != 0:
         if verbose:
-            print(("unable to run %s (error)" % dispcmd))
-            print(("stdout was %s" % stdout))
+            print("unable to run %s (error)" % dispcmd)
+            print("stdout was %s" % stdout)
         return None, p.returncode
     return stdout, p.returncode
 
@@ -124,8 +124,8 @@ def versions_from_parentdir(parentdir_prefix, root, verbose):
             root = os.path.dirname(root)  # up a level
 
     if verbose:
-        print(("Tried directories %s but none started with prefix %s" %
-              (str(rootdirs), parentdir_prefix)))
+        print("Tried directories %s but none started with prefix %s" %
+              (str(rootdirs), parentdir_prefix))
     raise NotThisMethod("rootdir doesn't start with parentdir_prefix")
 
 
@@ -192,15 +192,15 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
         # "stabilization", as well as "HEAD" and "master".
         tags = set([r for r in refs if re.search(r'\d', r)])
         if verbose:
-            print(("discarding '%s', no digits" % ",".join(refs - tags)))
+            print("discarding '%s', no digits" % ",".join(refs - tags))
     if verbose:
-        print(("likely tags: %s" % ",".join(sorted(tags))))
+        print("likely tags: %s" % ",".join(sorted(tags)))
     for ref in sorted(tags):
         # sorting will prefer e.g. "2.0" over "2.0rc1"
         if ref.startswith(tag_prefix):
             r = ref[len(tag_prefix):]
             if verbose:
-                print(("picking %s" % r))
+                print("picking %s" % r)
             return {"version": r,
                     "full-revisionid": keywords["full"].strip(),
                     "dirty": False, "error": None,
@@ -229,7 +229,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
                           hide_stderr=True)
     if rc != 0:
         if verbose:
-            print(("Directory %s not under git control" % root))
+            print("Directory %s not under git control" % root)
         raise NotThisMethod("'git rev-parse --git-dir' returned error")
 
     # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty]
@@ -278,7 +278,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
         if not full_tag.startswith(tag_prefix):
             if verbose:
                 fmt = "tag '%s' doesn't start with prefix '%s'"
-                print((fmt % (full_tag, tag_prefix)))
+                print(fmt % (full_tag, tag_prefix))
             pieces["error"] = ("tag '%s' doesn't start with prefix '%s'"
                                % (full_tag, tag_prefix))
             return pieces

nevow/nevow/appserver.py

@@ -180,7 +180,7 @@ def defaultExceptionHandlerFactory(ctx):
     return DefaultExceptionHandler()
 
 @implementer(inevow.IRequest)
-class NevowRequest(tpc.Componentized): #; , server.Request):
+class NevowRequest(tpc.Componentized, server.Request):
     """
     A Request subclass which does additional
     processing if a form was POSTed. When a form is POSTed,
@@ -548,4 +548,3 @@ from nevow import rend
 NotFound = rend.NotFound
 FourOhFour = rend.FourOhFour
 
-classImplements(server.Session, inevow.ISession)