Merge pull request #8 from learningequality/master

Further beta releases in 0.11

README.rst

@@ -97,8 +97,11 @@ Windows compatibility.
 * Only cross-platform features are now guaranteed to be in the result set:
   ``['inet', 'ether', 'inet6', 'netmask']``
 * IPv6 addresses are now stored in a list.
-* Removed prefixlen, as it should be added to one IPv6 address, not the
+* Removed prefixlen and scopeid, as they should be added for each IPv6 address, not the
   interface
+* Allow ``ifcfg`` to be imported despite whether or not the OS system is
+  recognized.
+* Remove ``ifcfg.exc`` module
 
 
 0.10.1

src/ifcfg/__init__.py

@@ -4,10 +4,9 @@
 import os
 import platform
 from . import tools
-from . import exc
 from . import parser
 
-__version__ = "0.11b2"
+__version__ = "0.11b4"
 
 Log = tools.minimal_logger(__name__)
 
@@ -30,7 +29,8 @@ def get_parser_class():
         # https://stackoverflow.com/a/2145582/405682
         Parser = parser.WindowsParser
     else:
-        raise exc.IfcfgParserError("Unknown distro type '%s'." % distro)
+        Parser = parser.NullParser
+        Log.error("Unknown distro type '%s'." % distro)
     Log.debug("Distro detected as '%s'" % distro)
     Log.debug("Using '%s'" % Parser)
 

src/ifcfg/parser.py

@@ -141,6 +141,28 @@ def default_interface(self):
         raise NotImplementedError()
 
 
+class NullParser(Parser):
+    """
+    Doesn't do anything, useful to maintain internal interfaces in case we
+    don't want to do anything (because we haven't determined the OS)
+    """
+
+    def __init__(self, ifconfig=None):
+        self._interfaces = {}
+        self.ifconfig_data = ifconfig
+
+    def parse(self, ifconfig=None):
+        raise NotImplementedError()
+
+    @property
+    def interfaces(self):
+        return []
+
+    @property
+    def default_interface(self):
+        return None
+
+
 class WindowsParser(Parser):
 
     @classmethod
@@ -193,7 +215,6 @@ def get_patterns(cls):
             '.*broadcast (?P<broadcast>[^\s]*).*',
             '.*netmask (?P<netmask>[^\s]*).*',
             '.*ether (?P<ether>[^\s]*).*',
-            '.*scopeid (?P<scopeid>[^\s]*).*',
         ]
 
     @property
@@ -244,7 +265,6 @@ def get_patterns(cls):
             '.*(P-t-P:)(?P<ptp>[^\s]*).*',
             '.*(Bcast:)(?P<broadcast>[^\s]*).*',
             '.*(Mask:)(?P<netmask>[^\s]*).*',
-            '.*(Scope:)(?P<scopeid>[^\s]*).*',
             '.*(RX bytes:)(?P<rxbytes>\d+).*',
             '.*(TX bytes:)(?P<txbytes>\d+).*',
         ]

tests/ifconfig_tests.py

@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 import ifcfg
+from ifcfg.parser import NullParser
 from nose.tools import eq_, ok_, raises
 
 from . import ifconfig_out
@@ -17,10 +18,10 @@ def test_ifcfg(self):
         res = len(interfaces) > 0
         ok_(res)
 
-    @raises(ifcfg.exc.IfcfgParserError)
     def test_unknown(self):
         ifcfg.distro = 'Bogus'
         ifcfg.Parser = ifcfg.get_parser_class()
+        self.assertTrue(issubclass(ifcfg.Parser, NullParser))
 
     @raises(RuntimeError)
     def test_illegal(self):

tests/no_mock_tests.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+"""
+Tests that don't mock anything, just run on the host system.
+"""
+from __future__ import unicode_literals
+
+import ifcfg
+
+from .base import IfcfgTestCase
+
+
+class IfcfgTestCase(IfcfgTestCase):
+
+    def test_ifcfg(self):
+        for interface in ifcfg.interfaces():
+            print(interface)