17.10.2018

AppLoidx · Oct 17, 2018 · 082d949 · 082d949
1 parent b372e01
commit 082d949
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 8 deletions.
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/Lilly.py b/Lilly.py
@@ -3,10 +3,11 @@
 from questions.GetQuestion import GetQuestion
 from Parse.Recipe import Recipe
 from Parse import Parser
-from ScheduleFromFile import ScheduleFromFile
+from schedule.ScheduleFromFile import ScheduleFromFile
 from client_server import ServerClient
 from Parse import Date
 
+
 class Lilly:
 
     def __init__(self):
@@ -224,9 +225,9 @@ def get_schedule(self, tomorrow="no"):
 
         # Файлы с разными кодрировками
         if os.name == "nt":
-            sh_filename = "shWindows.txt"
+            sh_filename = "schedule/shWindows.txt"
         else:
-            sh_filename = "sh.txt"
+            sh_filename = "schedule/sh.txt"
 
         today_day = self.date.get_day_of_week().strip()
 

diff --git a/Test.py b/Test.py
@@ -1,6 +1,3 @@
-from Parse.Schedule import Schedule
-import ScheduleFromFile
-import Parse.Date
 import Lilly
 
 lilly = Lilly.Lilly()

diff --git a/queue/__init__.py → groupQueue/__init__.py b/queue/__init__.py → groupQueue/__init__.py
diff --git a/ScheduleFromFile.py → schedule/ScheduleFromFile.py b/ScheduleFromFile.py → schedule/ScheduleFromFile.py
diff --git a/schedule/__init__.py b/schedule/__init__.py
diff --git a/sh.txt → schedule/sh.txt b/sh.txt → schedule/sh.txt
diff --git a/shWindows.txt → schedule/shWindows.txt b/shWindows.txt → schedule/shWindows.txt