Enforce __init__.py to not just contain from __future__ imports. This…

… wastes time and, without absolute_import, causes unnecessary file system calls.
cctbx · Jan 24, 2017 · ef4aeef · ef4aeef
1 parent a6f3dc5
commit ef4aeef
Show file tree

Hide file tree

Showing 117 changed files with 13 additions and 121 deletions.
diff --git a/boost_adaptbx/__init__.py b/boost_adaptbx/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/boost_adaptbx/command_line/__init__.py b/boost_adaptbx/command_line/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/cbflib_adaptbx/command_line/__init__.py b/cbflib_adaptbx/command_line/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/cctbx/array_family/__init__.py b/cctbx/array_family/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/cctbx/command_line/__init__.py b/cctbx/command_line/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/cctbx/development/__init__.py b/cctbx/development/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/cctbx/eltbx/__init__.py b/cctbx/eltbx/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/cctbx/eltbx/development/__init__.py b/cctbx/eltbx/development/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/cctbx/examples/__init__.py b/cctbx/examples/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/cctbx/examples/merging/samosa/__init__.py b/cctbx/examples/merging/samosa/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/cctbx/examples/structure_factor_calculus/__init__.py b/cctbx/examples/structure_factor_calculus/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/cctbx/macro_mol/__init__.py b/cctbx/macro_mol/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/cctbx/regression/__init__.py b/cctbx/regression/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/cctbx/source_generators/__init__.py b/cctbx/source_generators/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/cctbx/source_generators/eltbx/__init__.py b/cctbx/source_generators/eltbx/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/cctbx/web/__init__.py b/cctbx/web/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/crys3d/__init__.py b/crys3d/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/crys3d/command_line/__init__.py b/crys3d/command_line/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/cudatbx/math/__init__.py b/cudatbx/math/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/fable/command_line/__init__.py b/fable/command_line/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/gltbx/command_line/__init__.py b/gltbx/command_line/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/iota/__init__.py b/iota/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/iota/command_line/__init__.py b/iota/command_line/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/iota/components/__init__.py b/iota/components/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/iotbx/PrettyPrint/__init__.py b/iotbx/PrettyPrint/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/iotbx/cns/__init__.py b/iotbx/cns/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/iotbx/command_line/__init__.py b/iotbx/command_line/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/iotbx/detectors/context/__init__.py b/iotbx/detectors/context/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/iotbx/detectors/util/__init__.py b/iotbx/detectors/util/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/iotbx/dtrek/__init__.py b/iotbx/dtrek/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/iotbx/examples/__init__.py b/iotbx/examples/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/iotbx/kriber/__init__.py b/iotbx/kriber/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/iotbx/pdb/remediation/__init__.py b/iotbx/pdb/remediation/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/iotbx/regression/__init__.py b/iotbx/regression/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/iotbx/regression/ncs/__init__.py b/iotbx/regression/ncs/__init__.py
@@ -1,2 +0,0 @@
-from __future__ import division
-

diff --git a/iotbx/scalepack/__init__.py b/iotbx/scalepack/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/iotbx/solve/__init__.py b/iotbx/solve/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/iotbx/xds/__init__.py b/iotbx/xds/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/libtbx/auto_build/__init__.py b/libtbx/auto_build/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/libtbx/bundle/__init__.py b/libtbx/bundle/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/libtbx/command_line/__init__.py b/libtbx/command_line/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/libtbx/file_clutter.py b/libtbx/file_clutter.py
@@ -5,6 +5,8 @@
 
 class file_clutter(object):
 
+  from_future_pat = re.compile(
+    '^ from [ ]+ __future__ ', re.VERBOSE)
   from_future_import_division_pat = re.compile(
     '^ from [ ]+ __future__ [ ]+ import [ \w,]+ division', re.VERBOSE)
   from_future_import_absolute_import_pat = re.compile(
@@ -24,6 +26,7 @@ def __init__(self, path, find_unused_imports=False,
     self.flag_absolute_import = flag_absolute_import
     self.n_from_future_import_absolute_import = None
     self.bad_indentation = None
+    self.file_should_be_empty = False
     bytes = open(path, "rb").read()
     if (len(bytes) > 0):
       if (bytes[-1] != "\n"):
@@ -43,7 +46,10 @@ def __init__(self, path, find_unused_imports=False,
         self.n_from_future_import_division = 0
         self.n_from_future_import_absolute_import = 0
         py_lines = bytes.splitlines()
+        self.file_should_be_empty = True
         for line in py_lines:
+          if self.file_should_be_empty and line.strip() != '' and not self.from_future_pat.search(line):
+            self.file_should_be_empty = False
           if self.from_future_import_division_pat.search(line):
             self.n_from_future_import_division += 1
           if self.from_future_import_absolute_import_pat.search(line):
@@ -96,11 +102,16 @@ def status(self, flag_x, flag_dos_format=True, flag_indentation=False):
       sapp("bare excepts=%d" % self.n_bare_excepts)
     if (self.has_unused_imports()):
       sapp("unused imports=%d" % len(self.unused_imports))
-    if self.n_from_future_import_division == 0:
+    if self.file_should_be_empty:
+      if self.n_from_future_import_division == 0 and self.n_from_future_import_absolute_import == 0:
+        sapp("file is empty, should be 0 byte file")
+      else:
+        sapp("file contains only 'from __future__ import' and should be empty instead")
+    elif self.n_from_future_import_division == 0:
       sapp("missing 'from __future__ import division'")
     elif self.n_from_future_import_division > 1:
       sapp("more than one appearance of 'from __future__ import division'")
-    if self.flag_absolute_import:
+    if self.flag_absolute_import and not self.file_should_be_empty:
       if self.n_from_future_import_absolute_import == 0:
         sapp("missing 'from __future__ import absolute_import'")
       elif self.n_from_future_import_absolute_import > 1:

diff --git a/libtbx/program_utils/__init__.py b/libtbx/program_utils/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/libtbx/pythonpath/__init__.py b/libtbx/pythonpath/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/libtbx/server/__init__.py b/libtbx/server/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/libtbx/sphinx/__init__.py b/libtbx/sphinx/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/mmtbx/building/loop_closure/__init__.py b/mmtbx/building/loop_closure/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/mmtbx/cablam/__init__.py b/mmtbx/cablam/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/mmtbx/cablam/fingerprints/__init__.py b/mmtbx/cablam/fingerprints/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/mmtbx/geometry_restraints/__init__.py b/mmtbx/geometry_restraints/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/mmtbx/geometry_restraints/torsion_restraints/__init__.py b/mmtbx/geometry_restraints/torsion_restraints/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/mmtbx/ligands/__init__.py b/mmtbx/ligands/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/mmtbx/monomer_library/__init__.py b/mmtbx/monomer_library/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/mmtbx/regression/ncs/__init__.py b/mmtbx/regression/ncs/__init__.py
@@ -1,2 +0,0 @@
-from __future__ import division
-

diff --git a/mmtbx/regression/tls/__init__.py b/mmtbx/regression/tls/__init__.py
@@ -1,2 +0,0 @@
-from __future__ import division
-

diff --git a/mmtbx/sisa/__init__.py b/mmtbx/sisa/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/mmtbx/sisa/optimize/__init__.py b/mmtbx/sisa/optimize/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/mmtbx/twinning/__init__.py b/mmtbx/twinning/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/mmtbx/validation/ramachandran/__init__.py b/mmtbx/validation/ramachandran/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/mmtbx/validation/regression/__init__.py b/mmtbx/validation/regression/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/mmtbx/wwpdb/__init__.py b/mmtbx/wwpdb/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/prime/command_line/__init__.py b/prime/command_line/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/rstbx/apps/stills/__init__.py b/rstbx/apps/stills/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/rstbx/array_family/__init__.py b/rstbx/array_family/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/rstbx/bpcx/detector_model/__init__.py b/rstbx/bpcx/detector_model/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/rstbx/cftbx/__init__.py b/rstbx/cftbx/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/rstbx/command_line/__init__.py b/rstbx/command_line/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/rstbx/detectors/__init__.py b/rstbx/detectors/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/rstbx/dials_core/__init__.py b/rstbx/dials_core/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/rstbx/indexing/__init__.py b/rstbx/indexing/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/rstbx/new_horizons/__init__.py b/rstbx/new_horizons/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/rstbx/outlier_spots/__init__.py b/rstbx/outlier_spots/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/rstbx/phil/__init__.py b/rstbx/phil/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/rstbx/slip_viewer/__init__.py b/rstbx/slip_viewer/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/rstbx/symmetry/__init__.py b/rstbx/symmetry/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/scitbx/array_family/__init__.py b/scitbx/array_family/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/scitbx/boost_python/__init__.py b/scitbx/boost_python/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/scitbx/examples/__init__.py b/scitbx/examples/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/scitbx/graph/__init__.py b/scitbx/graph/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/scitbx/lstbx/__init__.py b/scitbx/lstbx/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/scitbx/lstbx/tests/__init__.py b/scitbx/lstbx/tests/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/scitbx/math/boost_python/__init__.py b/scitbx/math/boost_python/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/scitbx/math/tests/__init__.py b/scitbx/math/tests/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/scitbx/python_utils/__init__.py b/scitbx/python_utils/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/scitbx/rigid_body/essence/__init__.py b/scitbx/rigid_body/essence/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/scitbx/rigid_body/proto/__init__.py b/scitbx/rigid_body/proto/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/scitbx/source_generators/__init__.py b/scitbx/source_generators/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/scitbx/source_generators/array_family/__init__.py b/scitbx/source_generators/array_family/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/scitbx/stl/__init__.py b/scitbx/stl/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/smtbx/__init__.py b/smtbx/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/smtbx/ab_initio/tests/__init__.py b/smtbx/ab_initio/tests/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/smtbx/refinement/constraints/tests/__init__.py b/smtbx/refinement/constraints/tests/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/smtbx/source_generators/__init__.py b/smtbx/source_generators/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/smtbx/stl/__init__.py b/smtbx/stl/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/smtbx/structure_factors/__init__.py b/smtbx/structure_factors/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/spotfinder/applications/__init__.py b/spotfinder/applications/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/spotfinder/applications/heuristic_tbx/__init__.py b/spotfinder/applications/heuristic_tbx/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/spotfinder/applications/xfel/__init__.py b/spotfinder/applications/xfel/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/spotfinder/array_family/__init__.py b/spotfinder/array_family/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/spotfinder/command_line/__init__.py b/spotfinder/command_line/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/spotfinder/diffraction/__init__.py b/spotfinder/diffraction/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/wxtbx/command_line/__init__.py b/wxtbx/command_line/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/xfel/amo/__init__.py b/xfel/amo/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/xfel/amo/pnccd_ana/__init__.py b/xfel/amo/pnccd_ana/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/xfel/cftbx/__init__.py b/xfel/cftbx/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/xfel/cftbx/detector/__init__.py b/xfel/cftbx/detector/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/xfel/clustering/__init__.py b/xfel/clustering/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/xfel/command_line/__init__.py b/xfel/command_line/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/xfel/cxi/__init__.py b/xfel/cxi/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/xfel/cxi/clustering/__init__.py b/xfel/cxi/clustering/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/xfel/cxi/gfx/__init__.py b/xfel/cxi/gfx/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/xfel/graph_proc/__init__.py b/xfel/graph_proc/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/xfel/merging/__init__.py b/xfel/merging/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/xfel/small_cell/__init__.py b/xfel/small_cell/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/xfel/ui/command_line/__init__.py b/xfel/ui/command_line/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/xfel/ui/components/__init__.py b/xfel/ui/components/__init__.py
@@ -1 +0,0 @@
-from __future__ import division

diff --git a/xfel/xpp/__init__.py b/xfel/xpp/__init__.py
@@ -1 +0,0 @@
-from __future__ import division