Merge lp:~tycho-s/simplestreams/fix-condense into lp:~smoser/simplestreams/trunk

[Tycho Andersen]

A few fixes to condense:

* hoist unicode stuff correctly
* hoist tags out of versions into being siblings of products

A few fixes to condense:

* hoist unicode stuff correctly
* hoist tags out of versions into being siblings of products

[lp:~tycho-s/simplestreams/fix-condense]

348. By Tycho Andersen on 2014-06-09

whoops, don't commit pprint

=== modified file 'simplestreams/util.py'
--- simplestreams/util.py	2014-03-25 22:10:17 +0000
+++ simplestreams/util.py	2014-06-09 21:20:41 +0000
@@ -190,7 +190,7 @@
                 if not ref:
                     continue
                 value = data.get(key)
-                if value and isinstance(value, str):
+                if value and isinstance(value, _STRING_TYPES):
                     data.update(ref[value])
                     if delete:
                         del data[key]
@@ -370,11 +370,11 @@
             if k not in candidates:
                 continue
             if k in updates:
-                if v != updates[k] or not isinstance(v, str):
+                if v != updates[k] or not isinstance(v, _STRING_TYPES):
                     del updates[k]
                     candidates.remove(k)
             else:
-                if isinstance(v, str) and target.get(k, v) == v:
+                if isinstance(v, _STRING_TYPES) and target.get(k, v) == v:
                     updates[k] = v
                 else:
                     candidates.remove(k)
@@ -397,6 +397,7 @@
 
     walk_products(ptree, cb_version=call_move_dups)
     walk_products(ptree, cb_product=call_move_dups)
+    move_dups(ptree['products'], ptree)
 
 
 def assert_safe_path(path):
 
=== modified file 'tests/unittests/test_util.py'
--- tests/unittests/test_util.py	2014-03-25 14:12:01 +0000
+++ tests/unittests/test_util.py	2014-06-09 21:20:41 +0000
@@ -143,8 +143,17 @@
     def test_condense_1(self):
         tree = {'products': {'P1': {'versions': {'1': {'A': 'B'},
                                                  '2': {'A': 'B'}}}}}
-        exp = {'products': {'P1': {'versions': {'1': {}, '2': {}},
-                                   'A': 'B'}}}
+        exp = {'A': 'B',
+               'products': {'P1': {'versions': {'1': {}, '2': {}}}}}
+
+        util.products_condense(tree)
+        self.assertEqual(tree, exp)
+
+    def test_condense_unicode(self):
+        tree = {'products': {'P1': {'versions': {'1': {'A': u'B'},
+                                                 '2': {'A': u'B'}}}}}
+        exp = {'A': u'B',
+               'products': {'P1': {'versions': {'1': {}, '2': {}}}}}
 
         util.products_condense(tree)
         self.assertEqual(tree, exp)
@@ -168,8 +177,8 @@
         tree = {'products': {'P1': {'A': 'B',
                                     'versions': {'1': {'A': 'B'},
                                                  '2': {'A': 'B'}}}}}
-        exp = {'products': {'P1': {'versions': {'1': {}, '2': {}},
-                                   'A': 'B'}}}
+        exp = {'A': 'B',
+               'products': {'P1': {'versions': {'1': {}, '2': {}}}}}
 
         util.products_condense(tree)
         self.assertEqual(tree, exp)
@@ -178,8 +187,8 @@
         tree = {'products': {'P1': {'A': 'C',
                                     'versions': {'1': {'A': 'B'},
                                                  '2': {'A': 'B'}}}}}
-        exp = {'products': {'P1': {'A': 'C',
-                                   'versions': {'1': {'A': 'B'},
+        exp = {'A': 'C',
+               'products': {'P1': {'versions': {'1': {'A': 'B'},
                                                 '2': {'A': 'B'}}}}}
 
         util.products_condense(tree)