From 37aa8753fa67a1a8ad51cdc50539cab83f94ed2b Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Mon, 14 May 2018 13:31:47 +0200
Subject: Fix misplaces ConfigError exception.

---
 python/vyos/__init__.py                     | 1 +
 python/vyos/version.py                      | 4 ----
 src/conf-mode/vyos-config-bcast-relay.py    | 2 +-
 src/conf-mode/vyos-config-dns-forwarding.py | 2 +-
 src/conf-mode/vyos-config-mdns-repeater.py  | 2 +-
 src/conf-mode/vyos-config-ntp.py            | 2 +-
 src/conf-mode/vyos-config-ssh.py            | 2 +-
 src/conf-mode/vyos-update-crontab.py        | 2 +-
 8 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/python/vyos/__init__.py b/python/vyos/__init__.py
index e69de29bb..9b5ed21c9 100644
--- a/python/vyos/__init__.py
+++ b/python/vyos/__init__.py
@@ -0,0 +1 @@
+from .base import *
diff --git a/python/vyos/version.py b/python/vyos/version.py
index b3eff3965..5d32d878d 100644
--- a/python/vyos/version.py
+++ b/python/vyos/version.py
@@ -19,10 +19,6 @@
 
 import json
 
-class ConfigError(Exception):
-    pass
-
-
 def get_version_data(file='/opt/vyatta/etc/version.json'):
     with open(file, 'r') as f:
         version_data = json.load(f)
diff --git a/src/conf-mode/vyos-config-bcast-relay.py b/src/conf-mode/vyos-config-bcast-relay.py
index f60664051..785690d9c 100755
--- a/src/conf-mode/vyos-config-bcast-relay.py
+++ b/src/conf-mode/vyos-config-bcast-relay.py
@@ -23,7 +23,7 @@ import time
 import subprocess
 
 from vyos.config import Config
-from vyos.util import ConfigError
+from vyos import ConfigError
 
 config_file = r'/etc/default/udp-broadcast-relay'
 
diff --git a/src/conf-mode/vyos-config-dns-forwarding.py b/src/conf-mode/vyos-config-dns-forwarding.py
index df273b321..0d265f819 100755
--- a/src/conf-mode/vyos-config-dns-forwarding.py
+++ b/src/conf-mode/vyos-config-dns-forwarding.py
@@ -23,7 +23,7 @@ import netifaces
 import jinja2
 
 from vyos.config import Config
-from vyos.util import ConfigError
+from vyos import ConfigError
 
 config_file = r'/etc/powerdns/recursor.conf'
 
diff --git a/src/conf-mode/vyos-config-mdns-repeater.py b/src/conf-mode/vyos-config-mdns-repeater.py
index 3b8ca26ad..e648fd64f 100755
--- a/src/conf-mode/vyos-config-mdns-repeater.py
+++ b/src/conf-mode/vyos-config-mdns-repeater.py
@@ -22,7 +22,7 @@ import netifaces
 import time
 
 from vyos.config import Config
-from vyos.util import ConfigError
+from vyos import ConfigError
 
 config_file = r'/etc/default/mdns-repeater'
 
diff --git a/src/conf-mode/vyos-config-ntp.py b/src/conf-mode/vyos-config-ntp.py
index 061e8760e..8be12e44e 100755
--- a/src/conf-mode/vyos-config-ntp.py
+++ b/src/conf-mode/vyos-config-ntp.py
@@ -23,7 +23,7 @@ import jinja2
 import ipaddress
 
 from vyos.config import Config
-from vyos.util import ConfigError
+from vyos import ConfigError
 
 config_file = r'/etc/ntp.conf'
 
diff --git a/src/conf-mode/vyos-config-ssh.py b/src/conf-mode/vyos-config-ssh.py
index 1605dcd74..4949d6463 100755
--- a/src/conf-mode/vyos-config-ssh.py
+++ b/src/conf-mode/vyos-config-ssh.py
@@ -22,7 +22,7 @@ import os
 import jinja2
 
 from vyos.config import Config
-from vyos.util import ConfigError
+from vyos import ConfigError
 
 config_file = r'/etc/ssh/sshd_config'
 
diff --git a/src/conf-mode/vyos-update-crontab.py b/src/conf-mode/vyos-update-crontab.py
index 2d15de8ea..c19b88007 100755
--- a/src/conf-mode/vyos-update-crontab.py
+++ b/src/conf-mode/vyos-update-crontab.py
@@ -21,7 +21,7 @@ import re
 import sys
 
 from vyos.config import Config
-from vyos.util import ConfigError
+from vyos import ConfigError
 
 
 crontab_file = "/etc/cron.d/vyos-crontab"
-- 
cgit v1.2.3