Fix test error and add yuzp1996 to default_data.json

Add yuzp1996 to default_data.json.

Fix bug that test can not pass because of six is no longer
support in Python3 so I delete the moudle six and delete
the related logic.

Signed-off-by: yuzhipeng <[email protected]>

Author: yuzp1996

default_data.json

@@ -36522,6 +36522,17 @@
             "user_name": "Wenzhi Yu",
             "emails": ["[email protected]", "[email protected]"]
         },
+        {
+          "github_id": "yuzp1996",
+          "companies": [
+            {
+              "company_name": "Alauda",
+              "end_date": null
+            }
+          ],
+          "user_name": "yuzhipeng",
+          "emails": ["[email protected]", "[email protected]", "[email protected]"]
+        },
         {
             "github_id": "yxpoke",
             "companies": [

tests/test_config_files.py

@@ -13,11 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import functools
 import json
 
 import jsonschema
-import six
 import testtools
 
 DEFAULT_DATA_JSON_PATH = 'default_data.json'
@@ -50,10 +48,7 @@ def dict_raise_on_duplicates(ordered_pairs):
 class TestConfigFiles(testtools.TestCase):
 
     def _read_raw_file(self, file_name):
-        if six.PY3:
-            opener = functools.partial(open, encoding='utf8')
-        else:
-            opener = open
+        opener = open
         with opener(file_name, 'r') as content_file:
             return content_file.read()