Changeset 24

Timestamp:

05/29/06 13:34:41 (7 years ago)

Author:

mk

Message:

Decrease score for .pyo files (closes ticket #4).

Files:

• branches/mk/cheesecake/cheesecake_index.py (modified) (6 diffs)
• branches/mk/tests/test_count_files.py (modified) (2 diffs)

branches/mk/cheesecake/cheesecake_index.py

@@ -208 +208 @@
-        self.INDEX_REQUIRED_FILES = 100
-        self.INDEX_FILE_PYC      = -20
+        self.INDEX_FILE_PYO      = -20
-        self.INDEX_DIR_CRITICAL  = 25
-        self.INDEX_DIR           = 20
@@ -233 +234 @@
-            "INDEX_INSTALL", "INDEX_FILE_CRITICAL", "INDEX_FILE",
-            "INDEX_REQUIRED_FILES", "INDEX_FILE_PYC",
+            "INDEX_FILE_PYO",
-            "INDEX_DIR_CRITICAL", "INDEX_DIR", "INDEX_DIR_EMPTY",
-            "MAX_INDEX_DOCSTRINGS", "MAX_INDEX_PYLINT",
@@ -362 +364 @@
-        self.pkg_files = {}
-        self.pkg_dirs = {}
-
-
+
-        for type in self.file_types:
-            self.pkg_files[type] = []
@@ -659 +660 @@
-                    self.pkg_files["pyc"].append(fullpath)
-                    self.log.debug("pyc file found: " + fullpath)
+                elif self.is_pyo_file(file, dirs_in_rootdir):
+                    self.pkg_files["pyo"].append(fullpath)
+                    self.log.debug("pyo file found: " + fullpath)
-
-        len_pyc_list = len(self.pkg_files["pyc"])
@@ -664 +668 @@
-            self.index["file"].set_index("pyc", value=self.INDEX_FILE_PYC,
-                details="%d .pyc files found" % len_pyc_list)
+
+        len_pyo_list = len(self.pkg_files["pyo"])
+        if len_pyo_list:
+            self.index["file"].set_index("pyo", value=self.INDEX_FILE_PYO,
+                details="%d .pyo files found" % len_pyo_list)
+
-        self.log.debug("Found %d py files" % len(self.pkg_files["py"]))
-
+
+
-        self.log.debug("Found %d test files" % len(self.pkg_files["test"]))
-
@@ -671 +682 @@
-
-    def is_pyc_file(self, filename, dirs):
-
-
-
+
+
+
+
+
+
-        """
-        Return True if file ends with .py and it is not a special file and it is not
-        in special directory
-        """
-
+name
-            return False
-        if file in ["setup.py", "ez_setup.py", "__init__.py", "__pkginfo__.py"]:

branches/mk/tests/test_count_files.py

@@ -8 +8 @@
-import _path_cheesecake
-from cheesecake.cheesecake_index import Cheesecake
+
+if 'set' not in dir(__builtins__):
+    from sets import Set as set
-
-
@@ -54 +57 @@
-        self.cheesecake.walk_pkg()
-
-lf.cheesecake.pkg_files['py'] == py_files
+t(self.cheesecake.pkg_files['py']) == set(py_files)
-        assert self.cheesecake.pkg_files['pyc'] == []
+        assert self.cheesecake.pkg_files['pyo'] == []
-        assert self.cheesecake.pkg_files['test'] == []
-
+
+class TestPycPyoFiles(CountFiles):
+    def test_some_pyc_and_pyo_files(self):
+        py_files = self.prefix_with_package_name(['main.py'])
+        pyc_files = self.prefix_with_package_name(['main.pyc', 'missing.pyc'])
+        pyo_files = self.prefix_with_package_name(['main.pyo', 'optimised.pyo'])
+
+        self.create_files(py_files + pyc_files + pyo_files)
+        self.cheesecake.walk_pkg()
+
+        assert set(self.cheesecake.pkg_files['py']) == set(py_files)
+        assert set(self.cheesecake.pkg_files['pyc']) == set(pyc_files)
+        assert set(self.cheesecake.pkg_files['pyo']) == set(pyo_files)
+        assert self.cheesecake.pkg_files['test'] == []