Rename public functions (JuliaIO#699)

Author: musm

src/HDF5.jl

@@ -11,21 +11,23 @@ using Compat
 
 export
 @read, @write,
-h5open, h5read, h5rewrite, h5writeattr, h5readattr, h5write,
-a_create, a_delete, a_open, a_read, a_write, attrs,
-d_create, d_create_external, d_open, d_read, d_write,
-g_create, g_open,
-o_copy, o_delete, o_open,
-t_create, t_commit,
-p_create, get_access_properties, get_create_properties,
-dataspace, datatype,
-file, filename, name,
-get_chunk, get_datasets,
-iscontiguous, ishdf5, ismmappable,
-root, readmmap, set_dims!
+h5open, h5read, h5write, h5rewrite, h5writeattr, h5readattr,
+dataspace, datatype, # unexport
+file, filename, name, # unexport
+get_chunk, get_datasets, # unexport
+iscontiguous, ishdf5, ismmappable, # unexport
+root, readmmap, set_dims!, # unexport
+get_access_properties, get_create_properties # unexport
 # Note: Public API requires module scoping
 ### Public Functions:
-# g_info, o_info
+# create_attribute, open_attribute. delete_attribute, read_attribute, write_attribute, attributes,
+# create_dataset, create_external_dataset, open_dataset, read_dataset, write_dataset,
+# create_group, open_group,
+# copy_object, open_object,delete_object,
+# create_datatype, commit_datatype,
+# create_property
+
+# group_info, object_info
 ### Types:
 # H5DataStore, Attribute, File, Group, Dataset, Datatype, Opaque,
 # Dataspace, Object, Properties, VLen, ChunkStorage, Reference
@@ -910,11 +912,11 @@ Base.haskey(attr::Attributes, path::AbstractString) = h5a_exists(checkvalid(attr
 Base.haskey(dset::Union{Dataset,Datatype}, path::AbstractString) = h5a_exists(checkvalid(dset), path)
 
 # Querying items in the file
-g_info(obj::Union{Group,File}) = h5g_get_info(checkvalid(obj))
-o_info(obj::Union{File,Object}) = h5o_get_info(checkvalid(obj))
+group_info(obj::Union{Group,File}) = h5g_get_info(checkvalid(obj))
+object_info(obj::Union{File,Object}) = h5o_get_info(checkvalid(obj))
 
 Base.length(obj::Union{Group,File}) = h5g_get_num_objs(checkvalid(obj))
-Base.length(x::Attributes) = o_info(x.parent).num_attrs
+Base.length(x::Attributes) = object_info(x.parent).num_attrs
 
 Base.isempty(x::Union{Dataset,Group,File}) = length(x) == 0
 function Base.size(obj::Union{Dataset,Attribute})

src/deprecated.jl

@@ -372,5 +372,35 @@ function g_create(f::Function, parent::Union{File,Group}, args...)
     end
 end
 
-@deprecate info(obj::Union{Group,File}) g_info(obj) false
-@deprecate objinfo(obj::Union{File,Object}) o_info(obj) false
+
+
+### Changed in PR#696
+
+@deprecate info(obj::Union{Group,File}) group_info(obj)
+@deprecate objinfo(obj::Union{File,Object}) object_info(obj)
+
+# - rename bindings
+@deprecate a_create  HDF5.create_attribute
+@deprecate a_delete  HDF5.delete_attribute
+@deprecate a_open    HDF5.open_attribute
+@deprecate a_read    HDF5.read_attribute
+@deprecate a_write   HDF5.write_attribute
+@deprecate attrs     HDF5.attributes
+
+@deprecate d_create          HDF5.create_dataset
+@deprecate d_create_external HDF5.create_external_dataset
+@deprecate d_open            HDF5.open_dataset
+@deprecate d_read            HDF5.read_dataset
+@deprecate d_write           HDF5.write_dataset
+
+@deprecate g_create HDF5.create_group
+@deprecate g_open   HDF5.open_group
+
+@deprecate o_copy   HDF5.copy_object
+@deprecate o_delete HDF5.delete_object
+@deprecate o_open   HDF5.open_object
+
+@deprecate p_create HDF5.create_property
+
+@deprecate t_create HDF5.create_datatype
+@deprecate t_commit HDF5.commit_datatype

test/runtests.jl

@@ -25,5 +25,9 @@ try
     include("mpio.jl")
 catch
 end
+<<<<<<< HEAD
 
+=======
+
+>>>>>>> dd196c2 (Wrap all tests in a testset (#733))
 end