Remove conditional import of XibContext (lyft#42)

This was a workaround for PyCQA/pyflakes#247.
brightec · Mar 13, 2019 · 985ba29 · 985ba29
1 parent 732d69b
commit 985ba29
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 42 deletions.
diff --git a/xiblint/rules/accessibility_format.py b/xiblint/rules/accessibility_format.py
@@ -1,15 +1,13 @@
 import re
 
 from xiblint.rules import Rule
+from xiblint.xibcontext import XibContext
 from xiblint.xibutils import (
     get_object_id,
     get_view_user_defined_attr,
     view_accessibility_identifier,
 )
 
-if False:  # if TYPE_CHECKING:
-    from xiblint.xibcontext import XibContext
-
 
 class AccessibilityFormat(Rule):
     """

diff --git a/xiblint/rules/accessibility_labels_for_image_buttons.py b/xiblint/rules/accessibility_labels_for_image_buttons.py
@@ -1,13 +1,11 @@
 from xiblint.rules import Rule
+from xiblint.xibcontext import XibContext
 from xiblint.xibutils import (
     view_is_accessibility_element,
     view_accessibility_label,
     get_view_user_defined_attr,
 )
 
-if False:  # if TYPE_CHECKING:
-    from xiblint.xibcontext import XibContext
-
 
 class AccessibilityLabelsForImageButtons(Rule):
     """

diff --git a/xiblint/rules/accessibility_labels_for_images.py b/xiblint/rules/accessibility_labels_for_images.py
@@ -1,13 +1,11 @@
 from xiblint.rules import Rule
+from xiblint.xibcontext import XibContext
 from xiblint.xibutils import (
     view_is_accessibility_element,
     view_accessibility_label,
     get_view_user_defined_attr,
 )
 
-if False:  # if TYPE_CHECKING:
-    from xiblint.xibcontext import XibContext
-
 
 class AccessibilityLabelsForImages(Rule):
     """

diff --git a/xiblint/rules/accessibility_labels_for_text_with_placeholder.py b/xiblint/rules/accessibility_labels_for_text_with_placeholder.py
@@ -1,12 +1,10 @@
 from xiblint.rules import Rule
+from xiblint.xibcontext import XibContext
 from xiblint.xibutils import (
     get_view_user_defined_attr,
     view_is_accessibility_element,
 )
 
-if False:  # if TYPE_CHECKING:
-    from xiblint.xibcontext import XibContext
-
 
 class AccessibilityLabelsForTextWithPlaceholder(Rule):
     """

diff --git a/xiblint/rules/autolayout_frames.py b/xiblint/rules/autolayout_frames.py
@@ -1,7 +1,5 @@
 from xiblint.rules import Rule
-
-if False:  # if TYPE_CHECKING:
-    from xiblint.xibcontext import XibContext
+from xiblint.xibcontext import XibContext
 
 
 class AutolayoutFrames(Rule):

diff --git a/xiblint/rules/automation_identifiers.py b/xiblint/rules/automation_identifiers.py
@@ -1,7 +1,5 @@
 from xiblint.rules import Rule
-
-if False:  # if TYPE_CHECKING:
-    from xiblint.xibcontext import XibContext
+from xiblint.xibcontext import XibContext
 
 
 class AutomationIdentifiers(Rule):

diff --git a/xiblint/rules/automation_identifiers_for_outlet_labels.py b/xiblint/rules/automation_identifiers_for_outlet_labels.py
@@ -1,7 +1,5 @@
 from xiblint.rules import Rule
-
-if False:  # if TYPE_CHECKING:
-    from xiblint.xibcontext import XibContext
+from xiblint.xibcontext import XibContext
 
 
 class AutomationIdentifiersForOutletLabels(Rule):

diff --git a/xiblint/rules/no_simulated_metrics.py b/xiblint/rules/no_simulated_metrics.py
@@ -1,7 +1,5 @@
 from xiblint.rules import Rule
-
-if False:  # if TYPE_CHECKING:
-    from xiblint.xibcontext import XibContext
+from xiblint.xibcontext import XibContext
 
 
 class NoSimulatedMetrics(Rule):

diff --git a/xiblint/rules/no_trait_variations.py b/xiblint/rules/no_trait_variations.py
@@ -1,7 +1,5 @@
 from xiblint.rules import Rule
-
-if False:  # if TYPE_CHECKING:
-    from xiblint.xibcontext import XibContext
+from xiblint.xibcontext import XibContext
 
 
 class NoTraitVariations(Rule):

diff --git a/xiblint/rules/no_view_controller_links_to_other_bundles.py b/xiblint/rules/no_view_controller_links_to_other_bundles.py
@@ -1,7 +1,5 @@
 from xiblint.rules import Rule
-
-if False:  # if TYPE_CHECKING:
-    from xiblint.xibcontext import XibContext
+from xiblint.xibcontext import XibContext
 
 
 class NoViewControllerLinksToOtherBundles(Rule):

diff --git a/xiblint/rules/simulated_metrics_retina4_0.py b/xiblint/rules/simulated_metrics_retina4_0.py
@@ -1,7 +1,5 @@
 from xiblint.rules import Rule
-
-if False:  # if TYPE_CHECKING:
-    from xiblint.xibcontext import XibContext
+from xiblint.xibcontext import XibContext
 
 ALLOWED_DEVICES = [
     'retina4_0',

diff --git a/xiblint/rules/strict_font_names.py b/xiblint/rules/strict_font_names.py
@@ -1,7 +1,5 @@
 from xiblint.rules import Rule
-
-if False:  # if TYPE_CHECKING:
-    from xiblint.xibcontext import XibContext
+from xiblint.xibcontext import XibContext
 
 
 class StrictFontNames(Rule):

diff --git a/xiblint/rules/unavailable_custom_classes.py b/xiblint/rules/unavailable_custom_classes.py
@@ -1,9 +1,7 @@
 from xml.etree.ElementTree import Element
 
 from xiblint.rules import Rule
-
-if False:  # if TYPE_CHECKING:
-    from xiblint.xibcontext import XibContext
+from xiblint.xibcontext import XibContext
 
 
 class UnavailableCustomClasses(Rule):

diff --git a/xiblint/rules/unavailable_system_classes.py b/xiblint/rules/unavailable_system_classes.py
@@ -1,9 +1,7 @@
 from xml.etree.ElementTree import Element
 
 from xiblint.rules import Rule
-
-if False:  # if TYPE_CHECKING:
-    from xiblint.xibcontext import XibContext
+from xiblint.xibcontext import XibContext
 
 
 class UnavailableSystemClasses(Rule):