arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-15 21:08:55 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
grossmj 2015-05-03 11:41:09 -06:00
commit 65103e9332
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/config.py
View File

@ -135,7 +135,7 @@ class Config(object):
Read the configuration files.
"""
parsed_files = self._config.read(self._files)
parsed_files = self._config.read(self._files, encoding="utf-8")
if not parsed_files:
log.warning("No configuration file could be found or read")
else:

5
gns3server/handlers/upload_handler.py
View File

@ -36,8 +36,9 @@ class UploadHandler:
try:
for root, _, files in os.walk(UploadHandler.image_directory()):
for filename in files:
image_file = os.path.join(root, filename)
uploaded_files.append(image_file)
if not filename.startswith("."):
image_file = os.path.join(root, filename)
uploaded_files.append(image_file)
except OSError:
pass
iourc_path = os.path.join(os.path.expanduser("~/"), ".iourc")