Merge remote-tracking branch 'upstream/master' into obspy.fdsn

obspy · Aug 7, 2013 · 03049dd · 03049dd
2 parents 27e0be7 + 6059e6d
commit 03049dd
Show file tree

Hide file tree

Showing 17 changed files with 4 additions and 60 deletions.
diff --git a/obspy/__init__.py b/obspy/__init__.py
@@ -38,8 +38,6 @@
 
 __version__ = _getVersionString()
 
-__all__ = [UTCDateTime, _getVersionString, Trace, Stream, read, readEvents]
-
 
 if __name__ == '__main__':
     import doctest

diff --git a/obspy/arclink/__init__.py b/obspy/arclink/__init__.py
@@ -159,8 +159,6 @@
 
 from client import Client
 
-__all__ = [Client]
-
 
 if __name__ == '__main__':
     import doctest

diff --git a/obspy/core/__init__.py b/obspy/core/__init__.py
@@ -88,8 +88,6 @@
 from obspy.core.stream import Stream, read
 from obspy.core.scripts.runtests import runTests
 
-__all__ = [UTCDateTime, AttribDict, Stats, Trace, Stream, read, runTests]
-
 
 if __name__ == '__main__':
     import doctest

diff --git a/obspy/core/util/__init__.py b/obspy/core/util/__init__.py
@@ -35,13 +35,3 @@
 from obspy.core.util.obspy_types import OrderedDict, Enum
 from obspy.core.util.xmlwrapper import XMLParser, tostring, register_namespace
 from obspy.core.util.version import get_git_version as _getVersionString
-
-__all__ = [AttribDict, NamedTemporaryFile, add_doctests, add_unittests,
-           ALL_MODULES, DEFAULT_MODULES, NATIVE_BYTEORDER, c_file_p,
-           createEmptyDataChunk, getExampleFile, getMatplotlibVersion,
-           NETWORK_MODULES, _readFromPlugin, getScriptDirName, deprecated,
-           deprecated_keywords, skip, skipIf, uncompressFile, FlinnEngdahl,
-           calcVincentyInverse, gps2DistAzimuth, kilometer2degrees,
-           locations2degrees, BAND_CODE, complexifyString, guessDelta,
-           scoreatpercentile, toIntOrZero, loadtxt, OrderedDict, Enum,
-           XMLParser, tostring, register_namespace, _getVersionString]
diff --git a/obspy/core/util/geodetics/__init__.py b/obspy/core/util/geodetics/__init__.py
@@ -11,12 +11,9 @@
 """
 
 from obspy.core.util.geodetics.base import calcVincentyInverse, \
-    gps2DistAzimuth, kilometer2degrees, locations2degrees
+        gps2DistAzimuth, kilometer2degrees, locations2degrees
 from obspy.core.util.geodetics.flinnengdahl import FlinnEngdahl
 
-__all__ = [calcVincentyInverse, gps2DistAzimuth, kilometer2degrees,
-           locations2degrees, FlinnEngdahl]
-
 
 if __name__ == '__main__':
     import doctest

diff --git a/obspy/earthworm/__init__.py b/obspy/earthworm/__init__.py
@@ -43,8 +43,6 @@
 
 from client import Client
 
-__all__ = [Client]
-
 
 if __name__ == '__main__':
     import doctest

diff --git a/obspy/iris/__init__.py b/obspy/iris/__init__.py
@@ -134,7 +134,6 @@
 
 from client import Client
 
-__all__ = [Client]
 
 if __name__ == '__main__':
     import doctest

diff --git a/obspy/lib/__init__.py b/obspy/lib/__init__.py
@@ -3,10 +3,6 @@
 import platform
 
 # Import libtau in a platform specific way.
-libtau = __import__('libtau_%s_%s_py%s' % (
-    platform.system(),
-    platform.architecture()[0], ''.join(
-        [str(i) for i in platform.python_version_tuple()[:2]])),
-    globals(), locals())
-
-__all__ = [libtau]
+libtau = __import__('libtau_%s_%s_py%s' % (platform.system(),
+    platform.architecture()[0], ''.join([str(i) for i in
+    platform.python_version_tuple()[:2]])), globals(), locals())
diff --git a/obspy/neic/__init__.py b/obspy/neic/__init__.py
@@ -14,7 +14,6 @@
 
 from client import Client
 
-__all__ = [Client]
 
 if __name__ == '__main__':
     import doctest

diff --git a/obspy/neries/__init__.py b/obspy/neries/__init__.py
@@ -99,7 +99,6 @@
 
 from client import Client
 
-__all__ = [Client]
 
 if __name__ == '__main__':
     import doctest

diff --git a/obspy/realtime/__init__.py b/obspy/realtime/__init__.py
@@ -22,8 +22,6 @@
 from obspy.realtime.rtmemory import RtMemory
 from obspy.realtime.rttrace import RtTrace
 
-__all__ = [RtMemory, RtTrace]
-
 
 if __name__ == '__main__':
     import doctest

diff --git a/obspy/sac/__init__.py b/obspy/sac/__init__.py
@@ -61,8 +61,6 @@
 
 from sacio import SacIO, SacError, SacIOError, attach_paz, attach_resp
 
-__all__ = [SacIO, SacError, SacIOError, attach_paz, attach_resp]
-
 
 if __name__ == '__main__':
     import doctest

diff --git a/obspy/seishub/__init__.py b/obspy/seishub/__init__.py
@@ -83,8 +83,6 @@
 
 from obspy.seishub.client import Client
 
-__all__ = [Client]
-
 
 if __name__ == '__main__':
     import doctest

diff --git a/obspy/signal/__init__.py b/obspy/signal/__init__.py
@@ -200,15 +200,6 @@
     delayedSTALTA, zDetect, triggerOnset, pkBaer, arPick, \
     coincidenceTrigger, classicSTALTAPy
 
-__all__ = [bandpass, bandstop, lowpass, highpass, remezFIR, lowpassFIR,
-           envelope, integerDecimation, rotate_NE_RT, rotate_RT_NE,
-           rotate_ZNE_LQT, rotate_LQT_ZNE, cosTaper, cornFreq2Paz,
-           pazToFreqResp, seisSim, specInv, estimateMagnitude, normEnvelope,
-           centroid, instFreq, instBwith, utlGeoKm, utlLonLat, xcorr, xcorr_3C,
-           xcorrPickCorrection, cfrequency, bwith, domperiod, logcep, sonogram,
-           eigval, psd, PPSD, konnoOhmachiSmoothing, recSTALTA, recSTALTAPy,
-           carlSTATrig, classicSTALTA, delayedSTALTA, zDetect, triggerOnset,
-           pkBaer, arPick, coincidenceTrigger, classicSTALTAPy]
 
 if __name__ == '__main__':
     import doctest

diff --git a/obspy/taup/__init__.py b/obspy/taup/__init__.py
@@ -17,8 +17,6 @@
 # Convenience imports.
 from obspy.taup.taup import getTravelTimes, travelTimePlot
 
-__all__ = [getTravelTimes, travelTimePlot]
-
 if __name__ == '__main__':
     import doctest
     doctest.testmod(exclude_empty=True)
diff --git a/obspy/xseed/__init__.py b/obspy/xseed/__init__.py
@@ -76,8 +76,6 @@
 
 from obspy.xseed.parser import Parser
 
-__all__ = [Parser]
-
 
 if __name__ == '__main__':
     import doctest

diff --git a/obspy/xseed/blockette/__init__.py b/obspy/xseed/blockette/__init__.py
@@ -32,12 +32,3 @@
 from obspy.xseed.blockette.blockette060 import Blockette060
 from obspy.xseed.blockette.blockette061 import Blockette061
 from obspy.xseed.blockette.blockette062 import Blockette062
-
-
-__all__ = [Blockette, Blockette010, Blockette011, Blockette012, Blockette030,
-           Blockette031, Blockette032, Blockette033, Blockette034,
-           Blockette041, Blockette043, Blockette044, Blockette047,
-           Blockette048, Blockette050, Blockette051, Blockette052,
-           Blockette053, Blockette054, Blockette055, Blockette057,
-           Blockette058, Blockette059, Blockette060, Blockette061,
-           Blockette062]