Use Zope master branch

zopefoundation · May 1, 2018 · 5516515 · 5516515
1 parent eee1a51
commit 5516515
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/Products/GenericSetup/PluginIndexes/tests/test_exportimport.py b/Products/GenericSetup/PluginIndexes/tests/test_exportimport.py
@@ -21,6 +21,7 @@
 _DATE_XML = b"""\
 <index name="foo_date" meta_type="DateIndex">
  <property name="index_naive_time_as_local">True</property>
+ <property name="precision">1</property>
 </index>
 """
 
@@ -228,7 +229,7 @@ def _no_clear(*a):
             raise AssertionError("Don't clear me!")
         index = FieldIndex('foo_field')
         index.indexed_attrs = ['bar']
-        index.clear = _no_clear 
+        index.clear = _no_clear
         adapted = PluggableIndexNodeAdapter(index, environ)
         adapted.node = parseString(_FIELD_XML).documentElement # no raise
 
@@ -244,7 +245,7 @@ def _no_clear(*a):
             raise AssertionError("Don't clear me!")
         index = KeywordIndex('foo_keyword')
         index.indexed_attrs = ['bar']
-        index.clear = _no_clear 
+        index.clear = _no_clear
         adapted = PluggableIndexNodeAdapter(index, environ)
         adapted.node = parseString(_KEYWORD_XML).documentElement # no raise
 
@@ -274,7 +275,7 @@ def _no_clear(*a):
             raise AssertionError("Don't clear me!")
         index = DateIndex('foo_date')
         index._setPropValue('index_naive_time_as_local', True)
-        index.clear = _no_clear 
+        index.clear = _no_clear
         adapted = DateIndexNodeAdapter(index, environ)
         adapted.node = parseString(_DATE_XML).documentElement # no raise
 
@@ -291,7 +292,7 @@ def _no_clear(*a):
         index = DateRangeIndex('foo_daterange')
         index._since_field = 'bar'
         index._until_field = 'baz'
-        index.clear = _no_clear 
+        index.clear = _no_clear
         adapted = DateRangeIndexNodeAdapter(index, environ)
         adapted.node = parseString(_DATERANGE_XML).documentElement # no raise
 
@@ -306,7 +307,7 @@ def test_FilteredSet(self):
         def _no_clear(*a):
             raise AssertionError("Don't clear me!")
         index = PythonFilteredSet('bar', 'True')
-        index.clear = _no_clear 
+        index.clear = _no_clear
         adapted = FilteredSetNodeAdapter(index, environ)
         adapted.node = parseString(_SET_XML).documentElement # no raise
 
@@ -324,7 +325,7 @@ def _no_clear(*a):
         index.addFilteredSet('baz', 'PythonFilteredSet', 'False')
         bar = index.filteredSets['bar']
         baz = index.filteredSets['baz']
-        bar.clear = baz.clear = _no_clear 
+        bar.clear = baz.clear = _no_clear
         adapted = TopicIndexNodeAdapter(index, environ)
         adapted.node = parseString(_SET_XML).documentElement # no raise
 

diff --git a/Products/GenericSetup/ZCatalog/tests/test_exportimport.py b/Products/GenericSetup/ZCatalog/tests/test_exportimport.py
@@ -42,6 +42,7 @@ class _extra:
  </object>
 %s <index name="foo_date" meta_type="DateIndex">
   <property name="index_naive_time_as_local">True</property>
+  <property name="precision">1</property>
  </index>
  <index name="foo_daterange" meta_type="DateRangeIndex" since_field="bar"
     until_field="baz"/>

diff --git a/Products/GenericSetup/utils.py b/Products/GenericSetup/utils.py
@@ -515,6 +515,8 @@ def _importBody(self, body):
             filename = (self.filename or
                         '/'.join(self.context.getPhysicalPath()))
             raise ExpatError('%s: %s' % (filename, e))
+        # Replace the encoding with the one from the XML
+        self._encoding = dom.encoding or 'utf-8'
         self._importNode(dom.documentElement)
 
     body = property(_exportBody, _importBody)

diff --git a/buildout.cfg b/buildout.cfg
@@ -16,7 +16,7 @@ github_push = git@github.com:zopefoundation
 [sources]
 AccessControl = git ${remotes:github}/AccessControl.git pushurl=${remotes:github_push}/AccessControl.git branch=master
 Products.MailHost = git ${remotes:github}/Products.MailHost pushurl=${remotes:github_push}/Products.MailHost
-Zope = git ${remotes:github}/Zope pushurl=${remotes:github_push}/Zope branch=lines-property
+Zope = git ${remotes:github}/Zope pushurl=${remotes:github_push}/Zope branch=master
 
 [test]
 recipe = zc.recipe.testrunner