Procházet zdrojové kódy

Rename var module to vars (#983)

iron3oxide před 2 roky
rodič
revize
32f3a387ae
85 změnil soubory, kde provedl 89 přidání a 89 odebrání
  1. 1 1
      pynecone/__init__.py
  2. 1 1
      pynecone/compiler/compiler.py
  3. 1 1
      pynecone/compiler/utils.py
  4. 1 1
      pynecone/components/base/bare.py
  5. 1 1
      pynecone/components/base/link.py
  6. 1 1
      pynecone/components/component.py
  7. 1 1
      pynecone/components/datadisplay/badge.py
  8. 1 1
      pynecone/components/datadisplay/code.py
  9. 1 1
      pynecone/components/datadisplay/datatable.py
  10. 1 1
      pynecone/components/datadisplay/divider.py
  11. 1 1
      pynecone/components/datadisplay/list.py
  12. 1 1
      pynecone/components/datadisplay/stat.py
  13. 1 1
      pynecone/components/datadisplay/table.py
  14. 1 1
      pynecone/components/disclosure/accordion.py
  15. 1 1
      pynecone/components/disclosure/tabs.py
  16. 1 1
      pynecone/components/feedback/alert.py
  17. 1 1
      pynecone/components/feedback/circularprogress.py
  18. 1 1
      pynecone/components/feedback/progress.py
  19. 1 1
      pynecone/components/feedback/skeleton.py
  20. 1 1
      pynecone/components/feedback/spinner.py
  21. 1 1
      pynecone/components/forms/button.py
  22. 1 1
      pynecone/components/forms/checkbox.py
  23. 1 1
      pynecone/components/forms/copytoclipboard.py
  24. 1 1
      pynecone/components/forms/editable.py
  25. 1 1
      pynecone/components/forms/formcontrol.py
  26. 1 1
      pynecone/components/forms/iconbutton.py
  27. 1 1
      pynecone/components/forms/input.py
  28. 1 1
      pynecone/components/forms/numberinput.py
  29. 1 1
      pynecone/components/forms/password.py
  30. 1 1
      pynecone/components/forms/pininput.py
  31. 1 1
      pynecone/components/forms/radio.py
  32. 1 1
      pynecone/components/forms/rangeslider.py
  33. 1 1
      pynecone/components/forms/select.py
  34. 1 1
      pynecone/components/forms/slider.py
  35. 1 1
      pynecone/components/forms/switch.py
  36. 1 1
      pynecone/components/forms/textarea.py
  37. 1 1
      pynecone/components/forms/upload.py
  38. 1 1
      pynecone/components/graphing/plotly.py
  39. 1 1
      pynecone/components/graphing/victory.py
  40. 1 1
      pynecone/components/layout/aspect_ratio.py
  41. 1 1
      pynecone/components/layout/box.py
  42. 2 2
      pynecone/components/layout/cond.py
  43. 1 1
      pynecone/components/layout/container.py
  44. 1 1
      pynecone/components/layout/flex.py
  45. 1 1
      pynecone/components/layout/foreach.py
  46. 1 1
      pynecone/components/layout/grid.py
  47. 1 1
      pynecone/components/layout/stack.py
  48. 1 1
      pynecone/components/layout/wrap.py
  49. 1 1
      pynecone/components/media/avatar.py
  50. 1 1
      pynecone/components/media/image.py
  51. 1 1
      pynecone/components/navigation/breadcrumb.py
  52. 1 1
      pynecone/components/navigation/link.py
  53. 1 1
      pynecone/components/navigation/linkoverlay.py
  54. 1 1
      pynecone/components/navigation/nextlink.py
  55. 1 1
      pynecone/components/overlay/alertdialog.py
  56. 1 1
      pynecone/components/overlay/drawer.py
  57. 1 1
      pynecone/components/overlay/menu.py
  58. 1 1
      pynecone/components/overlay/modal.py
  59. 1 1
      pynecone/components/overlay/popover.py
  60. 1 1
      pynecone/components/overlay/tooltip.py
  61. 1 1
      pynecone/components/tags/cond_tag.py
  62. 1 1
      pynecone/components/tags/iter_tag.py
  63. 1 1
      pynecone/components/tags/tag.py
  64. 1 1
      pynecone/components/typography/heading.py
  65. 1 1
      pynecone/components/typography/highlight.py
  66. 1 1
      pynecone/components/typography/markdown.py
  67. 1 1
      pynecone/components/typography/span.py
  68. 1 1
      pynecone/components/typography/text.py
  69. 1 1
      pynecone/el/elements/__init__.py
  70. 1 1
      pynecone/event.py
  71. 1 1
      pynecone/state.py
  72. 1 1
      pynecone/style.py
  73. 1 1
      pynecone/utils/format.py
  74. 1 1
      pynecone/utils/imports.py
  75. 0 0
      pynecone/vars.py
  76. 1 1
      tests/compiler/test_compiler.py
  77. 5 5
      tests/components/datadisplay/conftest.py
  78. 1 1
      tests/components/layout/test_cond.py
  79. 1 1
      tests/components/test_component.py
  80. 1 1
      tests/components/test_tag.py
  81. 1 1
      tests/test_event.py
  82. 1 1
      tests/test_state.py
  83. 1 1
      tests/test_style.py
  84. 1 1
      tests/test_utils.py
  85. 1 1
      tests/test_var.py

+ 1 - 1
pynecone/__init__.py

@@ -30,4 +30,4 @@ from .route import route as route
 from .state import ComputedVar as var
 from .state import State as State
 from .style import toggle_color_mode as toggle_color_mode
-from .var import Var as Var
+from .vars import Var as Var

+ 1 - 1
pynecone/compiler/compiler.py

@@ -10,7 +10,7 @@ from pynecone.components.component import Component, CustomComponent
 from pynecone.state import State
 from pynecone.style import Style
 from pynecone.utils import imports
-from pynecone.var import ImportVar
+from pynecone.vars import ImportVar
 
 # Imports to be included in every Pynecone app.
 DEFAULT_IMPORTS: imports.ImportDict = {

+ 1 - 1
pynecone/compiler/utils.py

@@ -23,7 +23,7 @@ from pynecone.event import get_hydrate_event
 from pynecone.state import State
 from pynecone.style import Style
 from pynecone.utils import format, imports, path_ops
-from pynecone.var import ImportVar
+from pynecone.vars import ImportVar
 
 # To re-export this function.
 merge_imports = imports.merge_imports

+ 1 - 1
pynecone/components/base/bare.py

@@ -6,7 +6,7 @@ from typing import Any
 from pynecone.components.component import Component
 from pynecone.components.tags import Tag
 from pynecone.components.tags.tagless import Tagless
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Bare(Component):

+ 1 - 1
pynecone/components/base/link.py

@@ -2,7 +2,7 @@
 
 
 from pynecone.components.component import Component
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Link(Component):

+ 1 - 1
pynecone/components/component.py

@@ -22,7 +22,7 @@ from pynecone.event import (
 )
 from pynecone.style import Style
 from pynecone.utils import format, imports, types
-from pynecone.var import BaseVar, ImportVar, Var
+from pynecone.vars import BaseVar, ImportVar, Var
 
 
 class Component(Base, ABC):

+ 1 - 1
pynecone/components/datadisplay/badge.py

@@ -1,7 +1,7 @@
 """Badge component."""
 
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Badge(ChakraComponent):

+ 1 - 1
pynecone/components/datadisplay/code.py

@@ -6,7 +6,7 @@ from pynecone.components.component import Component
 from pynecone.components.libs.chakra import ChakraComponent
 from pynecone.style import Style
 from pynecone.utils import imports
-from pynecone.var import ImportVar, Var
+from pynecone.vars import ImportVar, Var
 
 # Path to the prism styles.
 PRISM_STYLES_PATH = "/styles/code/prism"

+ 1 - 1
pynecone/components/datadisplay/datatable.py

@@ -5,7 +5,7 @@ from typing import Any, List
 from pynecone.components.component import Component
 from pynecone.components.tags import Tag
 from pynecone.utils import format, imports, types
-from pynecone.var import BaseVar, ComputedVar, ImportVar, Var
+from pynecone.vars import BaseVar, ComputedVar, ImportVar, Var
 
 
 class Gridjs(Component):

+ 1 - 1
pynecone/components/datadisplay/divider.py

@@ -1,7 +1,7 @@
 """A line to divide parts of the layout."""
 
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Divider(ChakraComponent):

+ 1 - 1
pynecone/components/datadisplay/list.py

@@ -3,7 +3,7 @@
 from pynecone.components import Component
 from pynecone.components.layout.foreach import Foreach
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class List(ChakraComponent):

+ 1 - 1
pynecone/components/datadisplay/stat.py

@@ -2,7 +2,7 @@
 
 from pynecone.components.component import Component
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Stat(ChakraComponent):

+ 1 - 1
pynecone/components/datadisplay/table.py

@@ -3,7 +3,7 @@
 from pynecone.components.component import Component
 from pynecone.components.layout.foreach import Foreach
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Table(ChakraComponent):

+ 1 - 1
pynecone/components/disclosure/accordion.py

@@ -4,7 +4,7 @@ from typing import List, Optional, Union
 
 from pynecone.components.component import Component
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Accordion(ChakraComponent):

+ 1 - 1
pynecone/components/disclosure/tabs.py

@@ -2,7 +2,7 @@
 
 from pynecone.components.component import Component
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Tabs(ChakraComponent):

+ 1 - 1
pynecone/components/feedback/alert.py

@@ -2,7 +2,7 @@
 
 from pynecone.components.component import Component
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Alert(ChakraComponent):

+ 1 - 1
pynecone/components/feedback/circularprogress.py

@@ -2,7 +2,7 @@
 
 from pynecone.components.component import Component
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class CircularProgress(ChakraComponent):

+ 1 - 1
pynecone/components/feedback/progress.py

@@ -3,7 +3,7 @@
 from typing import Union
 
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Progress(ChakraComponent):

+ 1 - 1
pynecone/components/feedback/skeleton.py

@@ -1,7 +1,7 @@
 """Container to stack elements with spacing."""
 
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Skeleton(ChakraComponent):

+ 1 - 1
pynecone/components/feedback/spinner.py

@@ -1,7 +1,7 @@
 """Container to stack elements with spacing."""
 
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Spinner(ChakraComponent):

+ 1 - 1
pynecone/components/forms/button.py

@@ -1,7 +1,7 @@
 """A button component."""
 
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Button(ChakraComponent):

+ 1 - 1
pynecone/components/forms/checkbox.py

@@ -4,7 +4,7 @@ from typing import Dict
 
 from pynecone.components.component import EVENT_ARG
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Checkbox(ChakraComponent):

+ 1 - 1
pynecone/components/forms/copytoclipboard.py

@@ -3,7 +3,7 @@
 from typing import Set
 
 from pynecone.components import Component
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class CopyToClipboard(Component):

+ 1 - 1
pynecone/components/forms/editable.py

@@ -4,7 +4,7 @@ from typing import Dict
 
 from pynecone.components.libs.chakra import ChakraComponent
 from pynecone.event import EVENT_ARG
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Editable(ChakraComponent):

+ 1 - 1
pynecone/components/forms/formcontrol.py

@@ -2,7 +2,7 @@
 
 from pynecone.components.component import Component
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class FormControl(ChakraComponent):

+ 1 - 1
pynecone/components/forms/iconbutton.py

@@ -1,7 +1,7 @@
 """An icon button component."""
 
 from pynecone.components.typography.text import Text
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class IconButton(Text):

+ 1 - 1
pynecone/components/forms/input.py

@@ -5,7 +5,7 @@ from typing import Dict
 from pynecone.components.component import EVENT_ARG
 from pynecone.components.libs.chakra import ChakraComponent
 from pynecone.utils import imports
-from pynecone.var import ImportVar, Var
+from pynecone.vars import ImportVar, Var
 
 
 class Input(ChakraComponent):

+ 1 - 1
pynecone/components/forms/numberinput.py

@@ -5,7 +5,7 @@ from typing import Dict
 from pynecone.components.component import Component
 from pynecone.components.libs.chakra import ChakraComponent
 from pynecone.event import EVENT_ARG
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class NumberInput(ChakraComponent):

+ 1 - 1
pynecone/components/forms/password.py

@@ -1,7 +1,7 @@
 """A password input component."""
 
 from pynecone.components.forms.input import Input
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Password(Input):

+ 1 - 1
pynecone/components/forms/pininput.py

@@ -5,7 +5,7 @@ from typing import Dict
 from pynecone.components.component import Component
 from pynecone.components.libs.chakra import ChakraComponent
 from pynecone.event import EVENT_ARG
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class PinInput(ChakraComponent):

+ 1 - 1
pynecone/components/forms/radio.py

@@ -9,7 +9,7 @@ from pynecone.components.libs.chakra import ChakraComponent
 from pynecone.components.typography.text import Text
 from pynecone.event import EVENT_ARG
 from pynecone.utils import types
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class RadioGroup(ChakraComponent):

+ 1 - 1
pynecone/components/forms/rangeslider.py

@@ -5,7 +5,7 @@ from typing import Dict, List
 from pynecone.components.component import Component
 from pynecone.components.libs.chakra import ChakraComponent
 from pynecone.event import EVENT_ARG
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class RangeSlider(ChakraComponent):

+ 1 - 1
pynecone/components/forms/select.py

@@ -7,7 +7,7 @@ from pynecone.components.layout.foreach import Foreach
 from pynecone.components.libs.chakra import ChakraComponent
 from pynecone.components.typography.text import Text
 from pynecone.utils import types
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Select(ChakraComponent):

+ 1 - 1
pynecone/components/forms/slider.py

@@ -5,7 +5,7 @@ from typing import Dict
 from pynecone.components.component import Component
 from pynecone.components.libs.chakra import ChakraComponent
 from pynecone.event import EVENT_ARG
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Slider(ChakraComponent):

+ 1 - 1
pynecone/components/forms/switch.py

@@ -3,7 +3,7 @@ from typing import Dict
 
 from pynecone.components.component import EVENT_ARG
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Switch(ChakraComponent):

+ 1 - 1
pynecone/components/forms/textarea.py

@@ -4,7 +4,7 @@ from typing import Dict
 
 from pynecone.components.component import EVENT_ARG
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class TextArea(ChakraComponent):

+ 1 - 1
pynecone/components/forms/upload.py

@@ -6,7 +6,7 @@ from pynecone.components.component import EVENT_ARG, Component
 from pynecone.components.forms.input import Input
 from pynecone.components.layout.box import Box
 from pynecone.event import EventChain
-from pynecone.var import BaseVar, Var
+from pynecone.vars import BaseVar, Var
 
 upload_file = BaseVar(name="e => File(e)", type_=EventChain)
 

+ 1 - 1
pynecone/components/graphing/plotly.py

@@ -6,7 +6,7 @@ from plotly.graph_objects import Figure
 
 from pynecone.components.component import Component
 from pynecone.components.tags import Tag
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class PlotlyLib(Component):

+ 1 - 1
pynecone/components/graphing/victory.py

@@ -4,7 +4,7 @@ from typing import Any, Dict, List, Optional, Union
 
 from pynecone.components.component import Component
 from pynecone.style import Style
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 def format_xy(x: List, y: List) -> List:

+ 1 - 1
pynecone/components/layout/aspect_ratio.py

@@ -1,7 +1,7 @@
 """A AspectRatio component."""
 
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class AspectRatio(ChakraComponent):

+ 1 - 1
pynecone/components/layout/box.py

@@ -2,7 +2,7 @@
 
 from pynecone.components.libs.chakra import ChakraComponent
 from pynecone.components.tags import Tag
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Box(ChakraComponent):

+ 2 - 2
pynecone/components/layout/cond.py

@@ -7,7 +7,7 @@ from pynecone.components.component import Component
 from pynecone.components.layout.fragment import Fragment
 from pynecone.components.tags import CondTag, Tag
 from pynecone.utils import format
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Cond(Component):
@@ -93,7 +93,7 @@ def cond(condition: Any, c1: Any, c2: Any = None):
         ValueError: If the arguments are invalid.
     """
     # Import here to avoid circular imports.
-    from pynecone.var import BaseVar, Var
+    from pynecone.vars import BaseVar, Var
 
     # Convert the condition to a Var.
     cond_var = Var.create(condition)

+ 1 - 1
pynecone/components/layout/container.py

@@ -1,7 +1,7 @@
 """A flexbox container."""
 
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Container(ChakraComponent):

+ 1 - 1
pynecone/components/layout/flex.py

@@ -1,7 +1,7 @@
 """A reflexive container component."""
 
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Flex(ChakraComponent):

+ 1 - 1
pynecone/components/layout/foreach.py

@@ -5,7 +5,7 @@ from typing import Any, Callable, List
 
 from pynecone.components.component import Component
 from pynecone.components.tags import IterTag
-from pynecone.var import BaseVar, Var, get_unique_variable_name
+from pynecone.vars import BaseVar, Var, get_unique_variable_name
 
 
 class Foreach(Component):

+ 1 - 1
pynecone/components/layout/grid.py

@@ -3,7 +3,7 @@
 from typing import List
 
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Grid(ChakraComponent):

+ 1 - 1
pynecone/components/layout/stack.py

@@ -1,7 +1,7 @@
 """Container to stack elements with spacing."""
 
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Stack(ChakraComponent):

+ 1 - 1
pynecone/components/layout/wrap.py

@@ -2,7 +2,7 @@
 
 from pynecone.components.component import Component
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Wrap(ChakraComponent):

+ 1 - 1
pynecone/components/media/avatar.py

@@ -3,7 +3,7 @@
 from typing import Set
 
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Avatar(ChakraComponent):

+ 1 - 1
pynecone/components/media/image.py

@@ -5,7 +5,7 @@ from typing import Optional, Set
 
 from pynecone.components.component import Component
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Image(ChakraComponent):

+ 1 - 1
pynecone/components/navigation/breadcrumb.py

@@ -2,7 +2,7 @@
 
 from pynecone.components.component import Component
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Breadcrumb(ChakraComponent):

+ 1 - 1
pynecone/components/navigation/link.py

@@ -3,7 +3,7 @@
 from pynecone.components.component import Component
 from pynecone.components.libs.chakra import ChakraComponent
 from pynecone.components.navigation.nextlink import NextLink
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Link(ChakraComponent):

+ 1 - 1
pynecone/components/navigation/linkoverlay.py

@@ -1,7 +1,7 @@
 """Link overlay components."""
 
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class LinkOverlay(ChakraComponent):

+ 1 - 1
pynecone/components/navigation/nextlink.py

@@ -1,7 +1,7 @@
 """A link component."""
 
 from pynecone.components.component import Component
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class NextLink(Component):

+ 1 - 1
pynecone/components/overlay/alertdialog.py

@@ -5,7 +5,7 @@ from typing import Set
 from pynecone.components.component import Component
 from pynecone.components.libs.chakra import ChakraComponent
 from pynecone.components.media.icon import Icon
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class AlertDialog(ChakraComponent):

+ 1 - 1
pynecone/components/overlay/drawer.py

@@ -5,7 +5,7 @@ from typing import Set
 from pynecone.components.component import Component
 from pynecone.components.libs.chakra import ChakraComponent
 from pynecone.components.media.icon import Icon
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Drawer(ChakraComponent):

+ 1 - 1
pynecone/components/overlay/menu.py

@@ -4,7 +4,7 @@ from typing import Set
 
 from pynecone.components.component import Component
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Menu(ChakraComponent):

+ 1 - 1
pynecone/components/overlay/modal.py

@@ -5,7 +5,7 @@ from typing import Set
 from pynecone.components.component import Component
 from pynecone.components.libs.chakra import ChakraComponent
 from pynecone.components.media import Icon
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Modal(ChakraComponent):

+ 1 - 1
pynecone/components/overlay/popover.py

@@ -4,7 +4,7 @@ from typing import Set
 
 from pynecone.components.component import Component
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Popover(ChakraComponent):

+ 1 - 1
pynecone/components/overlay/tooltip.py

@@ -3,7 +3,7 @@
 from typing import Set
 
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Tooltip(ChakraComponent):

+ 1 - 1
pynecone/components/tags/cond_tag.py

@@ -3,7 +3,7 @@
 from typing import Any, Dict, Optional
 
 from pynecone.components.tags.tag import Tag
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class CondTag(Tag):

+ 1 - 1
pynecone/components/tags/iter_tag.py

@@ -5,7 +5,7 @@ import inspect
 from typing import TYPE_CHECKING, Callable, List
 
 from pynecone.components.tags.tag import Tag
-from pynecone.var import Var
+from pynecone.vars import Var
 
 if TYPE_CHECKING:
     from pynecone.components.component import Component

+ 1 - 1
pynecone/components/tags/tag.py

@@ -12,7 +12,7 @@ from plotly.io import to_json
 from pynecone.base import Base
 from pynecone.event import EventChain
 from pynecone.utils import format, types
-from pynecone.var import Var
+from pynecone.vars import Var
 
 if TYPE_CHECKING:
     from pynecone.components.component import ComponentStyle

+ 1 - 1
pynecone/components/typography/heading.py

@@ -1,7 +1,7 @@
 """A heading component."""
 
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Heading(ChakraComponent):

+ 1 - 1
pynecone/components/typography/highlight.py

@@ -3,7 +3,7 @@
 from typing import List
 
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Highlight(ChakraComponent):

+ 1 - 1
pynecone/components/typography/markdown.py

@@ -5,7 +5,7 @@ from typing import List, Union
 
 from pynecone.components.component import Component
 from pynecone.utils import types
-from pynecone.var import BaseVar, ImportVar, Var
+from pynecone.vars import BaseVar, ImportVar, Var
 
 
 class Markdown(Component):

+ 1 - 1
pynecone/components/typography/span.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Span(ChakraComponent):

+ 1 - 1
pynecone/components/typography/text.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 from pynecone.components.libs.chakra import ChakraComponent
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 class Text(ChakraComponent):

+ 1 - 1
pynecone/el/elements/__init__.py

@@ -2,7 +2,7 @@
 from typing import Union
 
 from pynecone.el.element import Element
-from pynecone.var import Var as PCVar
+from pynecone.vars import Var as PCVar
 
 
 class A(Element):  # noqa: E742

+ 1 - 1
pynecone/event.py

@@ -7,7 +7,7 @@ from typing import Any, Callable, Dict, List, Optional, Set, Tuple, Union
 from pynecone import constants
 from pynecone.base import Base
 from pynecone.utils import format
-from pynecone.var import BaseVar, Var
+from pynecone.vars import BaseVar, Var
 
 
 class Event(Base):

+ 1 - 1
pynecone/state.py

@@ -28,7 +28,7 @@ from pynecone import constants
 from pynecone.base import Base
 from pynecone.event import Event, EventHandler, fix_events, window_alert
 from pynecone.utils import format, prerequisites, types
-from pynecone.var import BaseVar, ComputedVar, PCDict, PCList, Var
+from pynecone.vars import BaseVar, ComputedVar, PCDict, PCList, Var
 
 Delta = Dict[str, Any]
 

+ 1 - 1
pynecone/style.py

@@ -5,7 +5,7 @@ from typing import Optional
 from pynecone import constants
 from pynecone.event import EventChain
 from pynecone.utils import format
-from pynecone.var import BaseVar, Var
+from pynecone.vars import BaseVar, Var
 
 toggle_color_mode = BaseVar(name=constants.TOGGLE_COLOR_MODE, type_=EventChain)
 

+ 1 - 1
pynecone/utils/format.py

@@ -216,7 +216,7 @@ def format_cond(
         The formatted conditional expression.
     """
     # Import here to avoid circular imports.
-    from pynecone.var import Var
+    from pynecone.vars import Var
 
     # Use Python truthiness.
     cond = f"isTrue({cond})"

+ 1 - 1
pynecone/utils/imports.py

@@ -3,7 +3,7 @@
 from collections import defaultdict
 from typing import Dict, Set
 
-from pynecone.var import ImportVar
+from pynecone.vars import ImportVar
 
 ImportDict = Dict[str, Set[ImportVar]]
 

+ 0 - 0
pynecone/var.py → pynecone/vars.py


+ 1 - 1
tests/compiler/test_compiler.py

@@ -4,7 +4,7 @@ import pytest
 
 from pynecone.compiler import utils
 from pynecone.utils import imports
-from pynecone.var import ImportVar
+from pynecone.vars import ImportVar
 
 
 @pytest.mark.parametrize(

+ 5 - 5
tests/components/datadisplay/conftest.py

@@ -36,7 +36,7 @@ def data_table_state2():
     class DataTableState(pc.State):
         _data = pd.DataFrame()
 
-        @pc.var  # type: ignore
+        @pc.var
         def data(self):
             return self._data
 
@@ -55,11 +55,11 @@ def data_table_state3():
         _data: List = []
         _columns: List = ["col1", "col2"]
 
-        @pc.var  # type: ignore
+        @pc.var
         def data(self) -> List:
             return self._data
 
-        @pc.var  # type: ignore
+        @pc.var
         def columns(self):
             return self._columns
 
@@ -78,11 +78,11 @@ def data_table_state4():
         _data: List = []
         _columns: List = ["col1", "col2"]
 
-        @pc.var  # type: ignore
+        @pc.var
         def data(self):
             return self._data
 
-        @pc.var  # type: ignore
+        @pc.var
         def columns(self) -> List:
             return self._columns
 

+ 1 - 1
tests/components/layout/test_cond.py

@@ -7,7 +7,7 @@ import pynecone as pc
 from pynecone.components.layout.cond import Cond, cond
 from pynecone.components.layout.fragment import Fragment
 from pynecone.components.typography.text import Text
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 @pytest.fixture

+ 1 - 1
tests/components/test_component.py

@@ -9,7 +9,7 @@ from pynecone.event import EVENT_ARG, EVENT_TRIGGERS, EventHandler
 from pynecone.state import State
 from pynecone.style import Style
 from pynecone.utils import imports
-from pynecone.var import ImportVar, Var
+from pynecone.vars import ImportVar, Var
 
 
 @pytest.fixture

+ 1 - 1
tests/components/test_tag.py

@@ -4,7 +4,7 @@ import pytest
 
 from pynecone.components.tags import CondTag, Tag
 from pynecone.event import EVENT_ARG, EventChain, EventHandler, EventSpec
-from pynecone.var import BaseVar, Var
+from pynecone.vars import BaseVar, Var
 
 
 def mock_event(arg):

+ 1 - 1
tests/test_event.py

@@ -3,7 +3,7 @@ import pytest
 from pynecone import event
 from pynecone.event import Event, EventHandler, EventSpec
 from pynecone.utils import format
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 def make_var(value) -> Var:

+ 1 - 1
tests/test_state.py

@@ -8,7 +8,7 @@ from pynecone.constants import IS_HYDRATED, RouteVar
 from pynecone.event import Event, EventHandler
 from pynecone.state import State
 from pynecone.utils import format
-from pynecone.var import BaseVar, ComputedVar
+from pynecone.vars import BaseVar, ComputedVar
 
 
 class Object(Base):

+ 1 - 1
tests/test_style.py

@@ -1,7 +1,7 @@
 import pytest
 
 from pynecone import style
-from pynecone.var import Var
+from pynecone.vars import Var
 
 test_style = [
     ({"a": 1}, {"a": 1}),

+ 1 - 1
tests/test_utils.py

@@ -4,7 +4,7 @@ from typing import Any, List, Union
 import pytest
 
 from pynecone.utils import build, format, imports, prerequisites, types
-from pynecone.var import Var
+from pynecone.vars import Var
 
 
 @pytest.mark.parametrize(

+ 1 - 1
tests/test_var.py

@@ -6,7 +6,7 @@ import pytest
 
 from pynecone.base import Base
 from pynecone.state import State
-from pynecone.var import BaseVar, ComputedVar, ImportVar, PCDict, PCList, Var
+from pynecone.vars import BaseVar, ComputedVar, ImportVar, PCDict, PCList, Var
 
 test_vars = [
     BaseVar(name="prop1", type_=int),