[PATCH] Fixed imports from parent modules to make epydoc happy

Jan Safranek jsafrane at redhat.com
Thu Sep 13 08:55:59 UTC 2012


On 09/13/2012 10:43 AM, Martin Sivak wrote:
> Hi,
> 
> I do not particulary like absolute imports to get intra-module stuff. It causes import of all __init__ files along the way and that is commonly breaking test isolation (because our __init__ files are wrong, but that is a different story).
> 
> Anyway, this is a bug in Epydoc and the patch introduces more hardcoded module names to our imports. So I would prefer not including this patch.
> 

Ok, I'll try to fix epydoc

Jan

> Martin
> 
> ----- Original Message -----
>> epydoc reported errors when processing sources:
>>
>>  Error: Source code parsing failed:
>>       Error during parsing: invalid syntax
>> (pyanaconda/storage/formats/disklabel.py, line 32) -- Bad name
>>
>> It gets confused by '..errors' in imports, so let's import full
>> module name instead.
>>
>> Signed-off-by: Jan Safranek <jsafrane at redhat.com>
>> ---
>>
>>  pyanaconda/storage/devicelibs/btrfs.py  |    2 +-
>>  pyanaconda/storage/devicelibs/crypto.py |    2 +-
>>  pyanaconda/storage/devicelibs/dm.py     |    2 +-
>>  pyanaconda/storage/devicelibs/loop.py   |    2 +-
>>  pyanaconda/storage/devicelibs/lvm.py    |    2 +-
>>  pyanaconda/storage/devicelibs/mdraid.py |    2 +-
>>  pyanaconda/storage/devicelibs/swap.py   |    2 +-
>>  pyanaconda/storage/formats/__init__.py  |    2 +-
>>  pyanaconda/storage/formats/biosboot.py  |    2 +-
>>  pyanaconda/storage/formats/disklabel.py |    2 +-
>>  pyanaconda/storage/formats/dmraid.py    |    2 +-
>>  pyanaconda/storage/formats/fs.py        |    2 +-
>>  pyanaconda/storage/formats/luks.py      |    2 +-
>>  pyanaconda/storage/formats/lvmpv.py     |    2 +-
>>  pyanaconda/storage/formats/mdraid.py    |    2 +-
>>  pyanaconda/storage/formats/multipath.py |    2 +-
>>  pyanaconda/storage/formats/prepboot.py  |    2 +-
>>  pyanaconda/storage/formats/swap.py      |    2 +-
>>  18 files changed, 18 insertions(+), 18 deletions(-)
>>
>> diff --git a/pyanaconda/storage/devicelibs/btrfs.py
>> b/pyanaconda/storage/devicelibs/btrfs.py
>> index f114ba4..1914175 100644
>> --- a/pyanaconda/storage/devicelibs/btrfs.py
>> +++ b/pyanaconda/storage/devicelibs/btrfs.py
>> @@ -24,7 +24,7 @@ import os
>>  import re
>>  
>>  from pyanaconda import iutil
>> -from ..errors import *
>> +from pyanaconda.storage.errors import *
>>  
>>  import gettext
>>  _ = lambda x: gettext.ldgettext("anaconda", x)
>> diff --git a/pyanaconda/storage/devicelibs/crypto.py
>> b/pyanaconda/storage/devicelibs/crypto.py
>> index 92a22a8..5e2da61 100644
>> --- a/pyanaconda/storage/devicelibs/crypto.py
>> +++ b/pyanaconda/storage/devicelibs/crypto.py
>> @@ -24,7 +24,7 @@ import os
>>  from pycryptsetup import CryptSetup
>>  from pyanaconda import iutil
>>  
>> -from ..errors import *
>> +from pyanaconda.storage.errors import *
>>  
>>  import gettext
>>  _ = lambda x: gettext.ldgettext("anaconda", x)
>> diff --git a/pyanaconda/storage/devicelibs/dm.py
>> b/pyanaconda/storage/devicelibs/dm.py
>> index cf4a0b8..1d85ebe 100644
>> --- a/pyanaconda/storage/devicelibs/dm.py
>> +++ b/pyanaconda/storage/devicelibs/dm.py
>> @@ -24,7 +24,7 @@ import os
>>  
>>  import block
>>  from pyanaconda import iutil
>> -from ..errors import *
>> +from pyanaconda.storage.errors import *
>>  
>>  import gettext
>>  _ = lambda x: gettext.ldgettext("anaconda", x)
>> diff --git a/pyanaconda/storage/devicelibs/loop.py
>> b/pyanaconda/storage/devicelibs/loop.py
>> index 132d4c3..dc66235 100644
>> --- a/pyanaconda/storage/devicelibs/loop.py
>> +++ b/pyanaconda/storage/devicelibs/loop.py
>> @@ -23,7 +23,7 @@
>>  import os
>>  
>>  from pyanaconda import iutil
>> -from ..errors import *
>> +from pyanaconda.storage.errors import *
>>  
>>  import gettext
>>  _ = lambda x: gettext.ldgettext("anaconda", x)
>> diff --git a/pyanaconda/storage/devicelibs/lvm.py
>> b/pyanaconda/storage/devicelibs/lvm.py
>> index e2d6215..ee6f668 100644
>> --- a/pyanaconda/storage/devicelibs/lvm.py
>> +++ b/pyanaconda/storage/devicelibs/lvm.py
>> @@ -28,7 +28,7 @@ from pyanaconda import iutil
>>  import logging
>>  log = logging.getLogger("storage")
>>  
>> -from ..errors import *
>> +from pyanaconda.storage.errors import *
>>  from pyanaconda.constants import *
>>  
>>  import gettext
>> diff --git a/pyanaconda/storage/devicelibs/mdraid.py
>> b/pyanaconda/storage/devicelibs/mdraid.py
>> index c2aad01..9e50299 100644
>> --- a/pyanaconda/storage/devicelibs/mdraid.py
>> +++ b/pyanaconda/storage/devicelibs/mdraid.py
>> @@ -23,7 +23,7 @@
>>  import os
>>  
>>  from pyanaconda import iutil
>> -from ..errors import *
>> +from pyanaconda.storage.errors import *
>>  
>>  import gettext
>>  _ = lambda x: gettext.ldgettext("anaconda", x)
>> diff --git a/pyanaconda/storage/devicelibs/swap.py
>> b/pyanaconda/storage/devicelibs/swap.py
>> index 5113787..b2c5067 100644
>> --- a/pyanaconda/storage/devicelibs/swap.py
>> +++ b/pyanaconda/storage/devicelibs/swap.py
>> @@ -25,7 +25,7 @@ import resource
>>  from pyanaconda import iutil
>>  import os
>>  
>> -from ..errors import *
>> +from pyanaconda.storage.errors import *
>>  from . import dm
>>  
>>  import gettext
>> diff --git a/pyanaconda/storage/formats/__init__.py
>> b/pyanaconda/storage/formats/__init__.py
>> index 838ad26..fc36772 100644
>> --- a/pyanaconda/storage/formats/__init__.py
>> +++ b/pyanaconda/storage/formats/__init__.py
>> @@ -27,7 +27,7 @@ from pyanaconda.iutil import notify_kernel
>>  from pyanaconda.iutil import get_sysfs_path_by_name
>>  from pyanaconda.iutil import execWithRedirect
>>  from pyanaconda.anaconda_log import log_method_call
>> -from ..errors import *
>> +from pyanaconda.storage.errors import *
>>  from ..devicelibs.dm import dm_node_from_name
>>  from ..devicelibs.mdraid import md_node_from_name
>>  from ..udev import udev_device_get_major, udev_device_get_minor
>> diff --git a/pyanaconda/storage/formats/biosboot.py
>> b/pyanaconda/storage/formats/biosboot.py
>> index 861b591..b6304b6 100644
>> --- a/pyanaconda/storage/formats/biosboot.py
>> +++ b/pyanaconda/storage/formats/biosboot.py
>> @@ -22,7 +22,7 @@
>>  
>>  from parted import PARTITION_BIOS_GRUB
>>  
>> -from ..errors import *
>> +from pyanaconda.storage.errors import *
>>  from . import DeviceFormat, register_device_format
>>  
>>  class BIOSBoot(DeviceFormat):
>> diff --git a/pyanaconda/storage/formats/disklabel.py
>> b/pyanaconda/storage/formats/disklabel.py
>> index 87dbea2..f417562 100644
>> --- a/pyanaconda/storage/formats/disklabel.py
>> +++ b/pyanaconda/storage/formats/disklabel.py
>> @@ -29,7 +29,7 @@ from pyanaconda.anaconda_log import log_method_call
>>  from pyanaconda import iutil
>>  import parted
>>  import _ped
>> -from ..errors import *
>> +from pyanaconda.storage.errors import *
>>  from ..udev import udev_settle
>>  from . import DeviceFormat, register_device_format
>>  
>> diff --git a/pyanaconda/storage/formats/dmraid.py
>> b/pyanaconda/storage/formats/dmraid.py
>> index 37624af..bb8c91d 100644
>> --- a/pyanaconda/storage/formats/dmraid.py
>> +++ b/pyanaconda/storage/formats/dmraid.py
>> @@ -22,7 +22,7 @@
>>  
>>  from pyanaconda.anaconda_log import log_method_call
>>  from pyanaconda.flags import flags
>> -from ..errors import *
>> +from pyanaconda.storage.errors import *
>>  from . import DeviceFormat, register_device_format
>>  
>>  import gettext
>> diff --git a/pyanaconda/storage/formats/fs.py
>> b/pyanaconda/storage/formats/fs.py
>> index 7b33476..7610a0f 100644
>> --- a/pyanaconda/storage/formats/fs.py
>> +++ b/pyanaconda/storage/formats/fs.py
>> @@ -33,7 +33,7 @@ import tempfile
>>  import selinux
>>  from pyanaconda import isys
>>  
>> -from ..errors import *
>> +from pyanaconda.storage.errors import *
>>  from . import DeviceFormat, register_device_format
>>  from pyanaconda import iutil
>>  from pyanaconda.flags import flags
>> diff --git a/pyanaconda/storage/formats/luks.py
>> b/pyanaconda/storage/formats/luks.py
>> index 6bb8b64..148468c 100644
>> --- a/pyanaconda/storage/formats/luks.py
>> +++ b/pyanaconda/storage/formats/luks.py
>> @@ -30,7 +30,7 @@ except ImportError:
>>      volume_key = None
>>  
>>  from pyanaconda.anaconda_log import log_method_call
>> -from ..errors import *
>> +from pyanaconda.storage.errors import *
>>  from ..devicelibs import crypto
>>  from . import DeviceFormat, register_device_format
>>  
>> diff --git a/pyanaconda/storage/formats/lvmpv.py
>> b/pyanaconda/storage/formats/lvmpv.py
>> index 77bbacd..374f562 100644
>> --- a/pyanaconda/storage/formats/lvmpv.py
>> +++ b/pyanaconda/storage/formats/lvmpv.py
>> @@ -24,7 +24,7 @@ import os
>>  
>>  from pyanaconda.anaconda_log import log_method_call
>>  from parted import PARTITION_LVM
>> -from ..errors import *
>> +from pyanaconda.storage.errors import *
>>  from ..devicelibs import lvm
>>  from . import DeviceFormat, register_device_format
>>  
>> diff --git a/pyanaconda/storage/formats/mdraid.py
>> b/pyanaconda/storage/formats/mdraid.py
>> index c543434..014eb44 100644
>> --- a/pyanaconda/storage/formats/mdraid.py
>> +++ b/pyanaconda/storage/formats/mdraid.py
>> @@ -25,7 +25,7 @@ import os
>>  from pyanaconda.anaconda_log import log_method_call
>>  from pyanaconda.flags import flags
>>  from parted import PARTITION_RAID
>> -from ..errors import *
>> +from pyanaconda.storage.errors import *
>>  from ..devicelibs import mdraid
>>  from . import DeviceFormat, register_device_format
>>  
>> diff --git a/pyanaconda/storage/formats/multipath.py
>> b/pyanaconda/storage/formats/multipath.py
>> index b77de20..a74ddb1 100644
>> --- a/pyanaconda/storage/formats/multipath.py
>> +++ b/pyanaconda/storage/formats/multipath.py
>> @@ -25,7 +25,7 @@
>>  #
>>  
>>  from pyanaconda.anaconda_log import log_method_call
>> -from ..errors import *
>> +from pyanaconda.storage.errors import *
>>  from . import DeviceFormat, register_device_format
>>  
>>  import gettext
>> diff --git a/pyanaconda/storage/formats/prepboot.py
>> b/pyanaconda/storage/formats/prepboot.py
>> index 884aa8f..65a1666 100644
>> --- a/pyanaconda/storage/formats/prepboot.py
>> +++ b/pyanaconda/storage/formats/prepboot.py
>> @@ -20,7 +20,7 @@
>>  # Red Hat Author(s): Dave Lehman <dlehman at redhat.com>
>>  #
>>  
>> -from ..errors import *
>> +from pyanaconda.storage.errors import *
>>  from . import DeviceFormat, register_device_format
>>  from parted import PARTITION_PREP
>>  import os
>> diff --git a/pyanaconda/storage/formats/swap.py
>> b/pyanaconda/storage/formats/swap.py
>> index 2267d68..03b85a9 100644
>> --- a/pyanaconda/storage/formats/swap.py
>> +++ b/pyanaconda/storage/formats/swap.py
>> @@ -23,7 +23,7 @@
>>  from pyanaconda.iutil import numeric_type
>>  from parted import PARTITION_SWAP, fileSystemType
>>  from pyanaconda.anaconda_log import log_method_call
>> -from ..errors import *
>> +from pyanaconda.storage.errors import *
>>  from ..devicelibs import swap
>>  from . import DeviceFormat, register_device_format
>>  
>>
>> _______________________________________________
>> anaconda-patches mailing list
>> anaconda-patches at lists.fedorahosted.org
>> https://lists.fedorahosted.org/mailman/listinfo/anaconda-patches
>>
> _______________________________________________
> anaconda-patches mailing list
> anaconda-patches at lists.fedorahosted.org
> https://lists.fedorahosted.org/mailman/listinfo/anaconda-patches
> 



More information about the anaconda-patches mailing list