Skip to content

Commit acf7fae

Browse files
ddaleddale
committed
cleanup imports
1 parent ddfe1e8 commit acf7fae

56 files changed

Lines changed: 356 additions & 371 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎quantities.e4p‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE Project SYSTEM "Project-4.6.dtd">
33
<!-- eric4 project file for project quantities -->
4-
<!-- Saved: 2009-01-19, 13:09:44 -->
4+
<!-- Saved: 2009-01-19, 14:46:07 -->
55
<!-- Copyright (C) 2009 , -->
66
<Project version="4.6">
77
<Language>en</Language>
@@ -62,9 +62,7 @@
6262
<Source>quantities/constants/alpha.py</Source>
6363
<Source>quantities/constants/neutron.py</Source>
6464
<Source>quantities/constants/_codata.py</Source>
65-
<Source>quantities/constants/rydberg.py</Source>
6665
<Source>quantities/constants/_utils.py</Source>
67-
<Source>quantities/constants/nuclearmagneton.py</Source>
6866
<Source>quantities/constants/quantum.py</Source>
6967
<Source>quantities/constants/electromagnetism.py</Source>
7068
<Source>quantities/constants/weak.py</Source>

‎quantities.egg-info/SOURCES.txt‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,28 @@ quantities.egg-info/SOURCES.txt
1212
quantities.egg-info/dependency_links.txt
1313
quantities.egg-info/top_level.txt
1414
quantities/constants/__init__.py
15-
quantities/constants/alternateunits.py
16-
quantities/constants/codata.py
17-
quantities/constants/comptonwavelengths.py
18-
quantities/constants/constants.py
19-
quantities/constants/magneticratios.py
20-
quantities/constants/massequivalence.py
21-
quantities/constants/massratios.py
15+
quantities/constants/_codata.py
16+
quantities/constants/_utils.py
17+
quantities/constants/alpha.py
18+
quantities/constants/astronomy.py
19+
quantities/constants/astrophysics.py
20+
quantities/constants/atomicunits.py
21+
quantities/constants/deuteron.py
22+
quantities/constants/electromagnetism.py
23+
quantities/constants/electron.py
24+
quantities/constants/helion.py
2225
quantities/constants/mathematical.py
26+
quantities/constants/muon.py
27+
quantities/constants/naturalunits.py
28+
quantities/constants/neutron.py
29+
quantities/constants/proton.py
30+
quantities/constants/quantum.py
2331
quantities/constants/relationships.py
24-
quantities/constants/utils.py
32+
quantities/constants/statisticalmechanics.py
33+
quantities/constants/tau.py
34+
quantities/constants/triton.py
35+
quantities/constants/weak.py
36+
quantities/constants/xray.py
2537
quantities/tests/__init__.py
2638
quantities/tests/test_quantities.py
2739
quantities/units/__init__.py

‎quantities/__init__.py‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
2525
but will fail if the requested units fails a dimensional analysis::
2626
27-
>>> q.units = 'J'
27+
>>> q.rescale('J')
2828
ValueError: Cannot convert between quanitites with units of 'ft' and 'J'
2929
3030
Here's some tricks for working compound units, which can be preserved::
@@ -77,12 +77,14 @@
7777
+/-1.6*J**2 (1 sigma)
7878
"""
7979

80+
from __future__ import absolute_import
81+
8082
__version__ = '0.1(bzr)'
8183

82-
from quantity import Quantity
83-
from uncertainquantity import UncertainQuantity
84-
from unitquantity import *
84+
from .quantity import Quantity
85+
from .uncertainquantity import UncertainQuantity
86+
from .unitquantity import *
8587

86-
from units.api import *
88+
from .units import *
8789

88-
from constants.api import *
90+
from . import constants

‎quantities/constants/__init__.py‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,21 @@
1+
from __future__ import absolute_import
12

3+
from .alpha import *
4+
from .astronomy import *
5+
from .atomicunits import *
6+
from .deuteron import *
7+
from .electromagnetism import *
8+
from .electron import *
9+
from .helion import *
10+
from .mathematical import *
11+
from .muon import *
12+
from .naturalunits import *
13+
from .neutron import *
14+
from .proton import *
15+
from .quantum import *
16+
from .relationships import *
17+
from .statisticalmechanics import *
18+
from .tau import *
19+
from .triton import *
20+
from .weak import *
21+
from .xray import *

‎quantities/constants/_utils.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from __future__ import absolute_import
12

23
from ._codata import physical_constants
34
from quantities.quantity import Quantity

‎quantities/constants/alpha.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from __future__ import absolute_import
55

66
from ._utils import _cd
7-
from quantities.unitquantity import UnitConstant
7+
from ..unitquantity import UnitConstant
88

99

1010
m_alpha = alpha_particle_mass = UnitConstant(

‎quantities/constants/api.py‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎quantities/constants/astronomy.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# -*- coding: utf-8 -*-
22
"""
33
"""
4+
from __future__ import absolute_import
45

5-
from quantities.constants._utils import _cd
6-
from quantities.uncertainquantity import UncertainQuantity
7-
from quantities.unitquantity import UnitConstant
6+
from ._utils import _cd
7+
from ..uncertainquantity import UncertainQuantity
8+
from ..unitquantity import UnitConstant
89

910

1011
au = astronomical_unit = UnitConstant(

‎quantities/constants/atomicunits.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
"""
44
from __future__ import absolute_import
55

6-
76
from ._utils import _cd
8-
from quantities.unitquantity import UnitConstant
7+
from ..unitquantity import UnitConstant
98

109

1110
amu = atomic_mass_constant = UnitConstant(

‎quantities/constants/deuteron.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
"""
44
from __future__ import absolute_import
55

6-
76
from ._utils import _cd
8-
from quantities.unitquantity import UnitConstant
7+
from ..unitquantity import UnitConstant
98

109

1110
R_d = deuteron_rms_charge_radius = UnitConstant(

0 commit comments

Comments
 (0)