From a8a02e881d461c2b5fc2f0deb8512d4bdb978b00 Mon Sep 17 00:00:00 2001 From: cclauss Date: Mon, 7 Jan 2019 15:50:05 +0100 Subject: [PATCH] Drop depencence on six module --- src/Mod/Arch/importDAE.py | 2 -- src/Mod/Import/gzip_utf8.py | 5 +---- src/Mod/Path/PathScripts/PathCircularHoleBaseGui.py | 2 -- src/Mod/Path/PathScripts/PathSurface.py | 2 -- src/Tools/generateBase/generateDS.py | 2 -- src/Tools/offlinedoc/buildqhelp.py | 2 -- 6 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/Mod/Arch/importDAE.py b/src/Mod/Arch/importDAE.py index 94f31044f3..6ac9bcc22b 100644 --- a/src/Mod/Arch/importDAE.py +++ b/src/Mod/Arch/importDAE.py @@ -21,8 +21,6 @@ #* * #*************************************************************************** -from six.moves import xrange - import FreeCAD, Mesh, os, numpy, MeshPart, Arch, Draft if FreeCAD.GuiUp: from DraftTools import translate diff --git a/src/Mod/Import/gzip_utf8.py b/src/Mod/Import/gzip_utf8.py index 1a4b5b01ad..7a99852861 100644 --- a/src/Mod/Import/gzip_utf8.py +++ b/src/Mod/Import/gzip_utf8.py @@ -16,10 +16,7 @@ but random access is not allowed.""" import struct, sys, time, os import zlib import io - -from six.moves import xrange -from six.moves.builtins import open as builtin_open - +from __builtin__ import open as builtin_open try: long except NameError: diff --git a/src/Mod/Path/PathScripts/PathCircularHoleBaseGui.py b/src/Mod/Path/PathScripts/PathCircularHoleBaseGui.py index ecb5025258..7a137e9010 100644 --- a/src/Mod/Path/PathScripts/PathCircularHoleBaseGui.py +++ b/src/Mod/Path/PathScripts/PathCircularHoleBaseGui.py @@ -22,8 +22,6 @@ # * * # *************************************************************************** -from six.moves import xrange - import FreeCAD import FreeCADGui import PathScripts.PathLog as PathLog diff --git a/src/Mod/Path/PathScripts/PathSurface.py b/src/Mod/Path/PathScripts/PathSurface.py index 7d2e000e75..d722226cda 100644 --- a/src/Mod/Path/PathScripts/PathSurface.py +++ b/src/Mod/Path/PathScripts/PathSurface.py @@ -24,8 +24,6 @@ from __future__ import print_function -from six.moves import xrange - import FreeCAD import MeshPart # import Part diff --git a/src/Tools/generateBase/generateDS.py b/src/Tools/generateBase/generateDS.py index d78c51bcc4..5bd7ffe460 100644 --- a/src/Tools/generateBase/generateDS.py +++ b/src/Tools/generateBase/generateDS.py @@ -31,8 +31,6 @@ import urllib2 from xml.sax import handler, make_parser import xml.sax.xmlreader -from six.moves import raw_input - ##from IPython.Shell import IPShellEmbed ##args = '' ##ipshell = IPShellEmbed(args, diff --git a/src/Tools/offlinedoc/buildqhelp.py b/src/Tools/offlinedoc/buildqhelp.py index f4530c677e..e09a7190d2 100755 --- a/src/Tools/offlinedoc/buildqhelp.py +++ b/src/Tools/offlinedoc/buildqhelp.py @@ -33,8 +33,6 @@ This script builds qhrlp files from a local copy of the wiki import sys, os, re, tempfile, getopt, shutil from urllib2 import urlopen, HTTPError -from six.moves import raw_input - # CONFIGURATION ################################################# FOLDER = "./localwiki"