From da24ef6324e2da1f0d328344637bc1549500ddb0 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Tue, 3 Jun 2014 11:09:35 +0200
Subject: [PATCH] minor fixes on versioning, probably due to changes in Python
 2.7 and BlueBream

---
 browser/form_macros.pt    | 5 +++--
 versioning/versionable.py | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/browser/form_macros.pt b/browser/form_macros.pt
index 068b433..18aa18c 100755
--- a/browser/form_macros.pt
+++ b/browser/form_macros.pt
@@ -264,9 +264,10 @@
           <label style="display: inline"
                  for="version.create"><span i18n:translate="">
             New version</span></label>
-          <tal:level condition="python: len(list(view.versionLevels)) > 1">:
+          <tal:level define="versionLevels python:list(view.versionLevels)"
+                     condition="python: len(versionLevels) > 1">:
             <select name="version.level">
-              <option tal:repeat="level view/versionLevels"
+              <option tal:repeat="level versionLevels"
                       i18n:translate=""
                       tal:attributes="value level/token"
                       tal:content="level/label" />
diff --git a/versioning/versionable.py b/versioning/versionable.py
index 5c3c683..f00cc08 100644
--- a/versioning/versionable.py
+++ b/versioning/versionable.py
@@ -168,7 +168,9 @@ class VersionableResource(object):
             for name in ('data', 'externalAddress',):
                 attrs.remove(name)
         for attr in attrs:
-            setattr(adaptedObj, attr, getattr(adaptedContext, attr))
+            value = getattr(adaptedContext, attr)
+            if not callable(value):
+                setattr(adaptedObj, attr, value)
         if IExternalFile.providedBy(adaptedObj):
             adaptedObj.storageParams = adaptedContext.storageParams
             adaptedObj.storageName = adaptedContext.storageName