29
29
import logging
30
30
import warnings
31
31
import weakref
32
+ from pathlib import Path
32
33
33
34
from ansys .dpf .core import errors , misc
34
35
from ansys .dpf .core import server as server_module
@@ -429,7 +430,6 @@ def load_library(self, file_path, name="", symbol="LoadOperators", generate_oper
429
430
)
430
431
if generate_operators :
431
432
# TODO: fix code generation upload posix
432
- import os
433
433
434
434
def __generate_code (TARGET_PATH , filename , name , symbol ):
435
435
from ansys .dpf .core .dpf_operator import Operator
@@ -444,8 +444,8 @@ def __generate_code(TARGET_PATH, filename, name, symbol):
444
444
except Exception as e :
445
445
warnings .warn ("Unable to generate the python code with error: " + str (e .args ))
446
446
447
- local_dir = os . path . dirname ( os . path . abspath ( __file__ ))
448
- LOCAL_PATH = os . path . join ( local_dir , "operators" )
447
+ local_dir = Path ( __file__ ). parent
448
+ LOCAL_PATH = local_dir / "operators"
449
449
if not self ._server ().local_server :
450
450
if self ._server ().os != "posix" or (not self ._server ().os and os .name != "posix" ):
451
451
# send local generated code
@@ -762,23 +762,24 @@ def upload_files_in_folder(
762
762
"""
763
763
server_paths = []
764
764
for root , subdirectories , files in os .walk (client_folder_path ):
765
+ root = Path (root )
765
766
for subdirectory in subdirectories :
766
- subdir = os . path . join ( root , subdirectory )
767
- for filename in os . listdir ( subdir ):
768
- f = os . path . join ( subdir , filename )
767
+ subdir = root / subdirectory
768
+ for filename in subdir . iterdir ( ):
769
+ f = subdir / filename
769
770
server_paths = self ._upload_and_get_server_path (
770
771
specific_extension ,
771
- f ,
772
+ str ( f ) ,
772
773
filename ,
773
774
server_paths ,
774
775
str (to_server_folder_path ),
775
776
subdirectory ,
776
777
)
777
778
for file in files :
778
- f = os . path . join ( root , file )
779
+ f = root / file
779
780
server_paths = self ._upload_and_get_server_path (
780
781
specific_extension ,
781
- f ,
782
+ str ( f ) ,
782
783
file ,
783
784
server_paths ,
784
785
str (to_server_folder_path ),
@@ -836,7 +837,8 @@ def upload_file(self, file_path, to_server_file_path):
836
837
server_file_path : str
837
838
path generated server side
838
839
"""
839
- if os .stat (file_path ).st_size == 0 :
840
+ file_path = Path (file_path )
841
+ if file_path .stat ().st_size == 0 :
840
842
raise ValueError (file_path + " is empty" )
841
843
if not self ._server ().has_client ():
842
844
txt = """
@@ -868,11 +870,12 @@ def upload_file_in_tmp_folder(self, file_path, new_file_name=None):
868
870
server_file_path : str
869
871
path generated server side
870
872
"""
873
+ file_path = Path (file_path )
871
874
if new_file_name :
872
875
file_name = new_file_name
873
876
else :
874
- file_name = os . path . basename (file_path )
875
- if os .stat (file_path ).st_size == 0 :
877
+ file_name = Path (file_path ). name
878
+ if file_path .stat ().st_size == 0 :
876
879
raise ValueError (file_path + " is empty" )
877
880
if not self ._server ().has_client ():
878
881
txt = """
0 commit comments