Move code from lib3 to lib

42 files changed, 2 insertions, 6 deletions

diff --git a/.gitignore b/.gitignore
index b59e62a..e531e48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 /dist/*
 /build/*
 /lib/PyYAML.egg-info/*
-/lib3/PyYAML.egg-info/*
 /wheelhouse/*
 /yaml/_yaml.c
 MANIFEST
diff --git a/MANIFEST.in b/MANIFEST.in
index f4051a1..3ab0c4f 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,10 +1,7 @@
 include CHANGES README LICENSE Makefile pyproject.toml setup.py
 recursive-include lib/yaml *.py
 recursive-include lib/_yaml *.py
-recursive-include lib3/yaml *.py
-recursive-include lib3/_yaml *.py
 recursive-include examples *.py *.cfg *.yaml
 recursive-include tests/data *
 recursive-include tests/lib *.py
-recursive-include tests/lib3 *.py
 recursive-include yaml *
diff --git a/lib3/_yaml/__init__.py b/lib/_yaml/__init__.py
index 7baa8c4..7baa8c4 100644
--- a/lib3/_yaml/__init__.py
+++ b/lib/_yaml/__init__.py
diff --git a/lib3/yaml/__init__.py b/lib/yaml/__init__.py
index 86d07b5..86d07b5 100644
--- a/lib3/yaml/__init__.py
+++ b/lib/yaml/__init__.py
diff --git a/lib3/yaml/composer.py b/lib/yaml/composer.py
index 6d15cb4..6d15cb4 100644
--- a/lib3/yaml/composer.py
+++ b/lib/yaml/composer.py
diff --git a/lib3/yaml/constructor.py b/lib/yaml/constructor.py
index 619acd3..619acd3 100644
--- a/lib3/yaml/constructor.py
+++ b/lib/yaml/constructor.py
diff --git a/lib3/yaml/cyaml.py b/lib/yaml/cyaml.py
index 0c21345..0c21345 100644
--- a/lib3/yaml/cyaml.py
+++ b/lib/yaml/cyaml.py
diff --git a/lib3/yaml/dumper.py b/lib/yaml/dumper.py
index 6aadba5..6aadba5 100644
--- a/lib3/yaml/dumper.py
+++ b/lib/yaml/dumper.py
diff --git a/lib3/yaml/emitter.py b/lib/yaml/emitter.py
index a664d01..a664d01 100644
--- a/lib3/yaml/emitter.py
+++ b/lib/yaml/emitter.py
diff --git a/lib3/yaml/error.py b/lib/yaml/error.py
index b796b4d..b796b4d 100644
--- a/lib3/yaml/error.py
+++ b/lib/yaml/error.py
diff --git a/lib3/yaml/events.py b/lib/yaml/events.py
index f79ad38..f79ad38 100644
--- a/lib3/yaml/events.py
+++ b/lib/yaml/events.py
diff --git a/lib3/yaml/loader.py b/lib/yaml/loader.py
index e90c112..e90c112 100644
--- a/lib3/yaml/loader.py
+++ b/lib/yaml/loader.py
diff --git a/lib3/yaml/nodes.py b/lib/yaml/nodes.py
index c4f070c..c4f070c 100644
--- a/lib3/yaml/nodes.py
+++ b/lib/yaml/nodes.py
diff --git a/lib3/yaml/parser.py b/lib/yaml/parser.py
index 13a5995..13a5995 100644
--- a/lib3/yaml/parser.py
+++ b/lib/yaml/parser.py
diff --git a/lib3/yaml/reader.py b/lib/yaml/reader.py
index 774b021..774b021 100644
--- a/lib3/yaml/reader.py
+++ b/lib/yaml/reader.py
diff --git a/lib3/yaml/representer.py b/lib/yaml/representer.py
index 3b0b192..3b0b192 100644
--- a/lib3/yaml/representer.py
+++ b/lib/yaml/representer.py
diff --git a/lib3/yaml/resolver.py b/lib/yaml/resolver.py
index 013896d..013896d 100644
--- a/lib3/yaml/resolver.py
+++ b/lib/yaml/resolver.py
diff --git a/lib3/yaml/scanner.py b/lib/yaml/scanner.py
index 7437ede..7437ede 100644
--- a/lib3/yaml/scanner.py
+++ b/lib/yaml/scanner.py
diff --git a/lib3/yaml/serializer.py b/lib/yaml/serializer.py
index fe911e6..fe911e6 100644
--- a/lib3/yaml/serializer.py
+++ b/lib/yaml/serializer.py
diff --git a/lib3/yaml/tokens.py b/lib/yaml/tokens.py
index 4d0b48a..4d0b48a 100644
--- a/lib3/yaml/tokens.py
+++ b/lib/yaml/tokens.py
diff --git a/setup.py b/setup.py
index 8c1842b..9c589aa 100644
--- a/setup.py
+++ b/setup.py
@@ -247,7 +247,7 @@ class test(Command):
         build_cmd = self.get_finalized_command('build')
         build_cmd.run()
         sys.path.insert(0, build_cmd.build_lib)
-        sys.path.insert(0, 'tests/lib3')
+        sys.path.insert(0, 'tests/lib')
         import test_all
         if not test_all.main([]):
             raise DistutilsError("Tests failed")
@@ -277,7 +277,7 @@ if __name__ == '__main__':
         classifiers=CLASSIFIERS,
         project_urls=PROJECT_URLS,
 
-        package_dir={'': 'lib3'},
+        package_dir={'': 'lib'},
         packages=['yaml', '_yaml'],
         ext_modules=[
             Extension('yaml._yaml', ['yaml/_yaml.pyx'],
diff --git a/tests/lib3/canonical.py b/tests/lib/canonical.py
index a8b4e3a..a8b4e3a 100644
--- a/tests/lib3/canonical.py
+++ b/tests/lib/canonical.py
diff --git a/tests/lib3/test_all.py b/tests/lib/test_all.py
index 72a5067..72a5067 100644
--- a/tests/lib3/test_all.py
+++ b/tests/lib/test_all.py
diff --git a/tests/lib3/test_appliance.py b/tests/lib/test_appliance.py
index b6f956d..b6f956d 100644
--- a/tests/lib3/test_appliance.py
+++ b/tests/lib/test_appliance.py
diff --git a/tests/lib3/test_build.py b/tests/lib/test_build.py
index df3f943..df3f943 100644
--- a/tests/lib3/test_build.py
+++ b/tests/lib/test_build.py
diff --git a/tests/lib3/test_build_ext.py b/tests/lib/test_build_ext.py
index fa843f6..fa843f6 100644
--- a/tests/lib3/test_build_ext.py
+++ b/tests/lib/test_build_ext.py
diff --git a/tests/lib3/test_canonical.py b/tests/lib/test_canonical.py
index a3b1153..a3b1153 100644
--- a/tests/lib3/test_canonical.py
+++ b/tests/lib/test_canonical.py
diff --git a/tests/lib3/test_constructor.py b/tests/lib/test_constructor.py
index f9a5077..f9a5077 100644
--- a/tests/lib3/test_constructor.py
+++ b/tests/lib/test_constructor.py
diff --git a/tests/lib3/test_emitter.py b/tests/lib/test_emitter.py
index 90d1652..90d1652 100644
--- a/tests/lib3/test_emitter.py
+++ b/tests/lib/test_emitter.py
diff --git a/tests/lib3/test_errors.py b/tests/lib/test_errors.py
index 9ef9bbe..9ef9bbe 100644
--- a/tests/lib3/test_errors.py
+++ b/tests/lib/test_errors.py
diff --git a/tests/lib3/test_input_output.py b/tests/lib/test_input_output.py
index 52ac342..52ac342 100644
--- a/tests/lib3/test_input_output.py
+++ b/tests/lib/test_input_output.py
diff --git a/tests/lib3/test_mark.py b/tests/lib/test_mark.py
index 09eea2e..09eea2e 100644
--- a/tests/lib3/test_mark.py
+++ b/tests/lib/test_mark.py
diff --git a/tests/lib3/test_multi_constructor.py b/tests/lib/test_multi_constructor.py
index f6e28fe..f6e28fe 100644
--- a/tests/lib3/test_multi_constructor.py
+++ b/tests/lib/test_multi_constructor.py
diff --git a/tests/lib3/test_reader.py b/tests/lib/test_reader.py
index c07b346..c07b346 100644
--- a/tests/lib3/test_reader.py
+++ b/tests/lib/test_reader.py
diff --git a/tests/lib3/test_recursive.py b/tests/lib/test_recursive.py
index 08042c8..08042c8 100644
--- a/tests/lib3/test_recursive.py
+++ b/tests/lib/test_recursive.py
diff --git a/tests/lib3/test_representer.py b/tests/lib/test_representer.py
index 10d4a8f..10d4a8f 100644
--- a/tests/lib3/test_representer.py
+++ b/tests/lib/test_representer.py
diff --git a/tests/lib3/test_resolver.py b/tests/lib/test_resolver.py
index f059dab..f059dab 100644
--- a/tests/lib3/test_resolver.py
+++ b/tests/lib/test_resolver.py
diff --git a/tests/lib3/test_sort_keys.py b/tests/lib/test_sort_keys.py
index f3f8a74..f3f8a74 100644
--- a/tests/lib3/test_sort_keys.py
+++ b/tests/lib/test_sort_keys.py
diff --git a/tests/lib3/test_structure.py b/tests/lib/test_structure.py
index 6d6f59d..6d6f59d 100644
--- a/tests/lib3/test_structure.py
+++ b/tests/lib/test_structure.py
diff --git a/tests/lib3/test_tokens.py b/tests/lib/test_tokens.py
index 828945a..828945a 100644
--- a/tests/lib3/test_tokens.py
+++ b/tests/lib/test_tokens.py
diff --git a/tests/lib3/test_yaml.py b/tests/lib/test_yaml.py
index 352cd8d..352cd8d 100644
--- a/tests/lib3/test_yaml.py
+++ b/tests/lib/test_yaml.py
diff --git a/tests/lib3/test_yaml_ext.py b/tests/lib/test_yaml_ext.py
index 264df0d..264df0d 100644
--- a/tests/lib3/test_yaml_ext.py
+++ b/tests/lib/test_yaml_ext.py