[rtems-tools commit] rtemstoolkit: msys2 compatibility

Sebastian Huber sebh at rtems.org
Fri Jan 8 06:59:34 UTC 2016


Module:    rtems-tools
Branch:    master
Commit:    606c08c8b521dce0121cddcabcc23f3e25ad2ffd
Changeset: http://git.rtems.org/rtems-tools/commit/?id=606c08c8b521dce0121cddcabcc23f3e25ad2ffd

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Jan  8 07:44:52 2016 +0100

rtemstoolkit: msys2 compatibility

---

 rtemstoolkit/execute.py |  4 ++--
 rtemstoolkit/git.py     | 10 +++++-----
 rtemstoolkit/log.py     |  2 +-
 rtemstoolkit/macros.py  |  4 ++--
 rtemstoolkit/path.py    |  4 ++--
 rtemstoolkit/version.py |  5 ++---
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/rtemstoolkit/execute.py b/rtemstoolkit/execute.py
index 3f8e3e6..4125182 100755
--- a/rtemstoolkit/execute.py
+++ b/rtemstoolkit/execute.py
@@ -41,8 +41,8 @@ import subprocess
 import threading
 import time
 
-import error
-import log
+from . import error
+from . import log
 
 # Trace exceptions
 trace_threads = False
diff --git a/rtemstoolkit/git.py b/rtemstoolkit/git.py
index 20a1aa6..3ba5f7a 100644
--- a/rtemstoolkit/git.py
+++ b/rtemstoolkit/git.py
@@ -31,11 +31,11 @@
 
 import os
 
-import error
-import execute
-import log
-import options
-import path
+from . import error
+from . import execute
+from . import log
+from . import options
+from . import path
 
 class repo:
     """An object to manage a git repo."""
diff --git a/rtemstoolkit/log.py b/rtemstoolkit/log.py
index 1308203..1af914d 100755
--- a/rtemstoolkit/log.py
+++ b/rtemstoolkit/log.py
@@ -36,7 +36,7 @@ import os
 import sys
 import threading
 
-import error
+from . import error
 
 #
 # A global log.
diff --git a/rtemstoolkit/macros.py b/rtemstoolkit/macros.py
index 632be87..5440e5c 100644
--- a/rtemstoolkit/macros.py
+++ b/rtemstoolkit/macros.py
@@ -38,8 +38,8 @@ import re
 import os
 import string
 
-import error
-import path
+from . import error
+from . import path
 
 #
 # Macro tables
diff --git a/rtemstoolkit/path.py b/rtemstoolkit/path.py
index c2f3ae2..a767b41 100644
--- a/rtemstoolkit/path.py
+++ b/rtemstoolkit/path.py
@@ -35,12 +35,12 @@
 #
 
 import glob
-import log
 import os
 import shutil
 import string
 
-import error
+from . import error
+from . import log
 
 windows = os.name == 'nt'
 
diff --git a/rtemstoolkit/version.py b/rtemstoolkit/version.py
index 542a8e0..3c135b1 100644
--- a/rtemstoolkit/version.py
+++ b/rtemstoolkit/version.py
@@ -35,9 +35,8 @@
 
 import sys
 
-import error
-import git
-import path
+from . import error
+from . import path
 
 #
 # Default to an internal string.



More information about the vc mailing list