Move server third-party packages to local-packages directory

Author: carlosperate

ardublocklyserver/__init__.py

@@ -2,10 +2,22 @@
 #
 # ardublocklyserver package.
 #
-# Copyright (c) 2015 carlosperate https://github.com/carlosperate/
+# Copyright (c) 2017 carlosperate https://github.com/carlosperate/
 # Licensed under the Apache License, Version 2.0 (the "License"):
 #   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Explicit imports will be used, only version included here.
+# There is a specific requirements for this Python project to not need
+# external module dependencies, so all third-party modules have been carefully
+# chosen with this purpose in mind and included in a folder named
+# 'local-packages'. The sys.path has to be expanded to be able to import these.
 #
-__version__ = '0.1.2'
+import os
+import sys
+
+# Adding the local-packages to the sys path
+local_packages_path = os.path.join(os.path.dirname(os.path.abspath(__file__)),
+                                   'local-packages')
+sys.path.insert(0, local_packages_path)
+
+# Follows Semantic Versioning 2.0.0 http://semver.org/spec/v2.0.0.html
+__version__ = '0.1.3-a'

ardublocklyserver/actions.py

@@ -13,21 +13,16 @@
 import json
 import sys
 import os
-try:
-    # 2.x name
-    import Tkinter
-    import urlparse
-    import tkFileDialog
-except ImportError:
-    # 3.x name
-    import tkinter as Tkinter
-    import urllib.parse as urlparse
-    import tkinter.filedialog as tkFileDialog
-
+# local-packages imports
+import six
+# Python 2 and 3 compatibility imports
+from six.moves import range
+from six.moves import tkinter as Tkinter
+from six.moves.urllib import parse as urlparse
+from six.moves import tkinter_tkfiledialog as tkFileDialog
+# This package modules
 from ardublocklyserver.compilersettings import ServerCompilerSettings
 from ardublocklyserver import sketchcreator
-import ardublocklyserver.six.six.moves as six_moves
-from ardublocklyserver.six import six
 import ardublocklyserver.gui as gui
 
 
@@ -105,7 +100,7 @@ def load_arduino_cli(sketch_path=None):
         print('CLI command: %s' % ' '.join(cli_command))
         # Python 2 needs the input to subprocess.Popen to be in system encoding
         if sys.version_info[0] < 3:
-            for item in six_moves.range(len(cli_command)):
+            for item in range(len(cli_command)):
                 cli_command[item] = cli_command[item].encode(
                     locale.getpreferredencoding())
 

ardublocklyserver/compilersettings.py

@@ -15,8 +15,9 @@
 import re
 import sys
 import codecs
-# configparser port of the 3.5 version to support unicode across all versions
-from ardublocklyserver import configparser
+# local-packages imports
+import configparser
+# This package modules
 import ardublocklyserver.serialport
 
 

ardublocklyserver/configparser/README.md …er/local-packages/configparser/README.mdardublocklyserver/configparser/README.md renamed to ardublocklyserver/local-packages/configparser/README.md ardublocklyserver/configparser/README.md renamed to ardublocklyserver/local-packages/configparser/README.md

@@ -134,9 +134,9 @@
 import sys
 import warnings
 
-from ardublocklyserver.configparser.helpers import OrderedDict as _default_dict
-from ardublocklyserver.configparser.helpers import ChainMap as _ChainMap
-from ardublocklyserver.configparser.helpers import from_none, open, str, PY2
+from configparser.helpers import OrderedDict as _default_dict
+from configparser.helpers import ChainMap as _ChainMap
+from configparser.helpers import from_none, open, str, PY2
 
 __all__ = ["NoSectionError", "DuplicateOptionError", "DuplicateSectionError",
            "NoOptionError", "InterpolationError", "InterpolationDepthError",